From a5e5b98ad862e6b952344f4c3fb4ea937f76e87f Mon Sep 17 00:00:00 2001 From: scullin Date: Tue, 14 Apr 1998 01:55:01 +0000 Subject: [PATCH] IRIX build fixes git-svn-id: svn://10.0.0.236/branches/MODULAR_NETLIB_BRANCH@223 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/lib/libnet/Makefile | 4 +++- mozilla/lib/libnet/mkaccess.h | 6 +++--- mozilla/lib/libnet/mkautocf.c | 10 +++++----- mozilla/lib/libnet/mkcache.h | 2 +- mozilla/lib/libnet/mkformat.c | 6 +++--- mozilla/lib/libnet/mkgeturl.h | 2 +- mozilla/lib/libnet/mkpadpac.h | 12 ++++++------ mozilla/lib/libnet/mkselect.h | 4 ++-- mozilla/lib/libnet/mkutils.h | 4 ++-- mozilla/lib/libnet/plstr2.h | 2 +- 10 files changed, 27 insertions(+), 25 deletions(-) diff --git a/mozilla/lib/libnet/Makefile b/mozilla/lib/libnet/Makefile index 4a873501748..2f01b7e3cb6 100644 --- a/mozilla/lib/libnet/Makefile +++ b/mozilla/lib/libnet/Makefile @@ -21,6 +21,8 @@ MODULE = netlib LIBRARY_NAME = netlib CSRCS = \ + pllist.c \ + plstr2.c \ depend.c \ mkgeturl.c \ mkconect.c \ @@ -92,7 +94,7 @@ endif include $(DEPTH)/config/rules.mk DEFINES += -DNEW_DECODERS -DB1M -INCLUDES += -I$(DEPTH)/raptor/base/src +INCLUDES += -I$(DEPTH)/base/src ifndef NO_UNIX_ASYNC_DNS DEFINES += -DUNIX_ASYNC_DNS diff --git a/mozilla/lib/libnet/mkaccess.h b/mozilla/lib/libnet/mkaccess.h index 099de544c37..90b543335e8 100644 --- a/mozilla/lib/libnet/mkaccess.h +++ b/mozilla/lib/libnet/mkaccess.h @@ -100,11 +100,11 @@ NET_BuildProxyAuthString(MWContext * context, * and TRUE if the user wants to continue with a new authorization * string. */ -PUBLIC XP_Bool +PUBLIC PRBool NET_AskForProxyAuth(MWContext * context, char * proxy_addr, char * pauth_params, - XP_Bool already_sent_auth); + PRBool already_sent_auth); /* * Figure out better of two {WWW,Proxy}-Authenticate headers; @@ -112,7 +112,7 @@ NET_AskForProxyAuth(MWContext * context, * enum values. * */ -extern XP_Bool +extern PRBool net_IsBetterAuth(char *new_auth, char *old_auth); /* create an HTML stream and push a bunch of HTML about cookies */ diff --git a/mozilla/lib/libnet/mkautocf.c b/mozilla/lib/libnet/mkautocf.c index f00ac9ba246..0a1137f4752 100644 --- a/mozilla/lib/libnet/mkautocf.c +++ b/mozilla/lib/libnet/mkautocf.c @@ -154,8 +154,8 @@ typedef enum { /* Declared in mkgeturl.c. NET_GetURL uses these variables to determine * whether or not the pac file has been loaded. */ -extern XP_Bool NET_GlobalAcLoaded; -extern XP_Bool NET_ProxyAcLoaded; +extern PRBool NET_GlobalAcLoaded; +extern PRBool NET_ProxyAcLoaded; /* Private proxy auto-config variables */ #ifdef MOCHA @@ -438,7 +438,7 @@ NET_SetNoProxyFailover(void) { #endif } -PUBLIC XP_Bool +PUBLIC PRBool NET_LoadingPac(void) { return pacf_loading; } @@ -1405,7 +1405,7 @@ PRIVATE char *proxy_dns_resolve(const char *host) { if (host) { const char *p; char *safe = NULL; - XP_Bool is_numeric_ip = TRUE; + PRBool is_numeric_ip = TRUE; for(p=host; *p; p++) { if (!XP_IS_DIGIT(*p) && *p != '.') { @@ -1480,7 +1480,7 @@ proxy_dnsResolve(JSContext *mc, JSObject *obj, unsigned int argc, MODULE_PRIVATE JSBool PR_CALLBACK proxy_myIpAddress(JSContext *mc, JSObject *obj, unsigned int argc, jsval *argv, jsval *rval) { - static XP_Bool initialized = FALSE; + static PRBool initialized = FALSE; static char *my_address = NULL; if (!initialized) { diff --git a/mozilla/lib/libnet/mkcache.h b/mozilla/lib/libnet/mkcache.h index 719834c83c6..5391b4eae2a 100644 --- a/mozilla/lib/libnet/mkcache.h +++ b/mozilla/lib/libnet/mkcache.h @@ -45,7 +45,7 @@ extern void NET_RemoveURLFromCache(URL_Struct *URL_s); extern void NET_DisplayCacheInfoAsHTML(ActiveEntry * cur_entry); /* trace variable for cache testing */ -extern XP_Bool NET_CacheTraceOn; +extern PRBool NET_CacheTraceOn; /* public accessor function for netcaster */ extern Bool NET_CacheStore(net_CacheObject *cacheObject, URL_Struct *url_s, Bool accept_partial_files); diff --git a/mozilla/lib/libnet/mkformat.c b/mozilla/lib/libnet/mkformat.c index 032f5943135..a9afc1e9dc0 100644 --- a/mozilla/lib/libnet/mkformat.c +++ b/mozilla/lib/libnet/mkformat.c @@ -446,12 +446,12 @@ void print_mime_types() { int32 i; - XP_List *list_ptr = NET_ciMasterList; NET_cdataStruct *cdata; + PL_ListEnumReset(NET_ciMasterList); fprintf(stderr, "\n---------\n"); - while ((cdata = (NET_cdataStruct *) XP_ListNextObject (list_ptr))) + while ((cdata = (NET_cdataStruct *) PL_ListEnumNext(NET_ciMasterList))) { fprintf (stderr, "%s%s%s (%s; %s):", (cdata->ci.type ? cdata->ci.type : ""), @@ -1146,7 +1146,7 @@ NET_CleanupFileFormat(char *filename) int len = 0; PRBool failed = FALSE; Bool file_open = FALSE; - XP_List *modifiedList = NULL; + PLList *modifiedList = NULL; char buffer[512]; Bool first = TRUE; diff --git a/mozilla/lib/libnet/mkgeturl.h b/mozilla/lib/libnet/mkgeturl.h index 98e94b78227..84a86f4e58d 100644 --- a/mozilla/lib/libnet/mkgeturl.h +++ b/mozilla/lib/libnet/mkgeturl.h @@ -104,7 +104,7 @@ extern int NET_TotalNumberOfOpenConnections; extern int NET_MaxNumberOfOpenConnections; extern CacheUseEnum NET_CacheUseMethod; extern time_t NET_StartupTime; /* time we began the program */ -extern XP_Bool NET_ProxyAcLoaded; +extern PRBool NET_ProxyAcLoaded; /* * Silently Interrupts all transfers in progress that have the same * window id as the one passed in. diff --git a/mozilla/lib/libnet/mkpadpac.h b/mozilla/lib/libnet/mkpadpac.h index 57c1f947f50..73fcb59f74c 100644 --- a/mozilla/lib/libnet/mkpadpac.h +++ b/mozilla/lib/libnet/mkpadpac.h @@ -49,15 +49,15 @@ #define pref_enablePad "network.enablePad" /* Global pad variables */ -extern XP_Bool foundPADPAC; +extern PRBool foundPADPAC; extern char *MK_padPacURL; -extern XP_Bool MK_PadEnabled; +extern PRBool MK_PadEnabled; /* ***** FUNCTION PROTOTYPES */ /* Setup internal variables to use or not use the proxy * autodiscovery feature. Actually not that simple. */ -MODULE_PRIVATE void net_UsePadPac(XP_Bool useIt); +MODULE_PRIVATE void net_UsePadPac(PRBool useIt); /* Return whether we're currently using a pac file via proxy autodiscovery. * This function takes three items into consideration: @@ -68,16 +68,16 @@ MODULE_PRIVATE void net_UsePadPac(XP_Bool useIt); * * If all these are true, then we're using a padpac file. */ -PUBLIC XP_Bool NET_UsingPadPac(void); +PUBLIC PRBool NET_UsingPadPac(void); /* Return whether or not we are currently in the process of loading * a proxy autoconfig url. */ -PUBLIC XP_Bool NET_LoadingPac(void); +PUBLIC PRBool NET_LoadingPac(void); /* Set the MK_padPacURL varialbe to point to the url passed in, * after checking the url for size limits. * Returns TRUE if successful, FALSE otherwise. */ -PUBLIC XP_Bool NET_SetPadPacURL(char * url); +PUBLIC PRBool NET_SetPadPacURL(char * url); /* Called by js prefs when the padpac url changes. */ MODULE_PRIVATE int PR_CALLBACK net_PadPacURLPrefChanged(const char *pref, void *data); diff --git a/mozilla/lib/libnet/mkselect.h b/mozilla/lib/libnet/mkselect.h index 41e584c6f64..3d68ad39b7d 100644 --- a/mozilla/lib/libnet/mkselect.h +++ b/mozilla/lib/libnet/mkselect.h @@ -35,7 +35,7 @@ extern void NET_ClearConnectPoll(PRFileDesc *fd); * dialog is up it won't call the OnIdle loop which is currently the * source of our events. */ -extern void NET_SetNetlibSlowKickTimer(XP_Bool set); +extern void NET_SetNetlibSlowKickTimer(PRBool set); /* set and clear the callnetliballthetime busy poller. * all reference counting is done internally @@ -45,7 +45,7 @@ extern void NET_SetNetlibSlowKickTimer(XP_Bool set); */ extern void NET_SetCallNetlibAllTheTime(MWContext *context, char *caller); extern void NET_ClearCallNetlibAllTheTime(MWContext *context, char *caller); -extern XP_Bool NET_IsCallNetlibAllTheTimeSet(MWContext *context, char *caller); +extern PRBool NET_IsCallNetlibAllTheTimeSet(MWContext *context, char *caller); extern void NET_SetReadSelect(MWContext *context, PRFileDesc *file_desc); extern void NET_ClearReadSelect(MWContext *context, PRFileDesc *file_desc); diff --git a/mozilla/lib/libnet/mkutils.h b/mozilla/lib/libnet/mkutils.h index 3c985bb738d..eda8da24283 100644 --- a/mozilla/lib/libnet/mkutils.h +++ b/mozilla/lib/libnet/mkutils.h @@ -64,7 +64,7 @@ extern int NET_URL_Type (CONST char *URL); extern void del_front_spaces (char *string); extern void NET_f_a_c (char **obj); -extern void NET_ParseContentTypeHeader(MWContext *context, char *value, URL_Struct *URL_s, XP_Bool is_http); +extern void NET_ParseContentTypeHeader(MWContext *context, char *value, URL_Struct *URL_s, PRBool is_http); /* * This function takes an error code and associated error data @@ -101,7 +101,7 @@ NET_WritePostData(MWContext *context, URL_Struct *URL_s, PRFileDesc *sock, void **write_post_data_data, - XP_Bool add_crlf_to_line_endings); + PRBool add_crlf_to_line_endings); extern char * NET_SpaceToPlus(char * string); diff --git a/mozilla/lib/libnet/plstr2.h b/mozilla/lib/libnet/plstr2.h index b5e75935648..bd7197ff22b 100644 --- a/mozilla/lib/libnet/plstr2.h +++ b/mozilla/lib/libnet/plstr2.h @@ -119,7 +119,7 @@ PL_bcmp(const void *b1, const void *b2, size_t count); */ PR_EXTERN(void) -PL_bcopy(void *dest, void *src, size_t count); +PL_bcopy(void *dest, void const *src, size_t count); /* * PL_bzero