rse 98/04/05 23:43:17
Modified: src/include http_main.h alloc.h src/main http_main.c alloc.c Log: Correct definitions of pstrcat() and check_alarm() to get a correct global symbol renaming configuration. Revision Changes Path 1.27 +1 -1 apache-1.3/src/include/http_main.h Index: http_main.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/include/http_main.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- http_main.h 1998/03/31 12:52:25 1.26 +++ http_main.h 1998/04/06 06:43:14 1.27 @@ -121,7 +121,7 @@ int update_child_status(int child_num, int status, request_rec *r); void time_process_request(int child_num, int status); unsigned int set_callback_and_alarm(void (*fn) (int), int x); -int check_alarm(void); +API_EXPORT(int) check_alarm(void); #ifndef NO_OTHER_CHILD /* 1.53 +1 -1 apache-1.3/src/include/alloc.h Index: alloc.h =================================================================== RCS file: /export/home/cvs/apache-1.3/src/include/alloc.h,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- alloc.h 1998/03/31 12:52:16 1.52 +++ alloc.h 1998/04/06 06:43:14 1.53 @@ -122,7 +122,7 @@ API_EXPORT(char *) pstrdup(struct pool *, const char *s); /* make a nul terminated copy of the n characters starting with s */ API_EXPORT(char *) pstrndup(struct pool *, const char *s, int n); -API_EXPORT(char *) pstrcat(struct pool *,...); /* all '...' must be char* */ +API_EXPORT_NONSTD(char *) pstrcat(struct pool *,...); /* all '...' must be char* */ API_EXPORT_NONSTD(char *) psprintf(struct pool *, const char *fmt, ...) __attribute__((format(printf,2,3))); API_EXPORT(char *) pvsprintf(struct pool *, const char *fmt, va_list); 1.320 +1 -1 apache-1.3/src/main/http_main.c Index: http_main.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v retrieving revision 1.319 retrieving revision 1.320 diff -u -r1.319 -r1.320 --- http_main.c 1998/04/05 23:16:09 1.319 +++ http_main.c 1998/04/06 06:43:15 1.320 @@ -976,7 +976,7 @@ #ifdef WIN32 -int check_alarm(void) +API_EXPORT(int) check_alarm(void) { if (alarm_expiry_time) { unsigned int t; 1.85 +1 -1 apache-1.3/src/main/alloc.c Index: alloc.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/alloc.c,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- alloc.c 1998/03/31 12:52:39 1.84 +++ alloc.c 1998/04/06 06:43:16 1.85 @@ -737,7 +737,7 @@ return res; } -char *pstrcat(pool *a,...) +API_EXPORT_NONSTD(char *) pstrcat(pool *a,...) { char *cp, *argp, *res;