martin 97/11/13 09:05:17
Modified: src/main util.c conf.h Log: Back away from enabling all of SUNOS_LIB_PROTOTYPES, instead prototype only the things we require in util.c. Submitted by: [EMAIL PROTECTED] (Ben Hyde) Reviewed by:Dean Gaudet, Martin Kraemer Revision Changes Path 1.77 +7 -1 apachen/src/main/util.c Index: util.c =================================================================== RCS file: /home/cvs/apachen/src/main/util.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -u -r1.76 -r1.77 --- util.c 1997/11/11 19:52:19 1.76 +++ util.c 1997/11/13 17:05:15 1.77 @@ -67,7 +67,13 @@ #include "httpd.h" #include "http_conf_globals.h" /* for user_id & group_id */ #include "http_log.h" -#include <stdio.h> +#if defined(SUNOS4) +/* stdio.h has been read in conf.h already. Add missing prototypes here: */ +extern int fgetc(FILE *); +extern char *fgets(char *s, int, FILE*); +extern int fclose(FILE *); +#endif + const char month_snames[12][4] = { 1.160 +2 -2 apachen/src/main/conf.h Index: conf.h =================================================================== RCS file: /home/cvs/apachen/src/main/conf.h,v retrieving revision 1.159 retrieving revision 1.160 diff -u -u -r1.159 -r1.160 --- conf.h 1997/11/13 16:41:00 1.159 +++ conf.h 1997/11/13 17:05:16 1.160 @@ -117,7 +117,6 @@ #define USE_FLOCK_SERIALIZED_ACCEPT #define NEED_DIFFTIME #define HAVE_SYSLOG -#define SUNOS_LIB_PROTOTYPES #elif defined(SOLARIS2) #undef HAVE_GMTOFF @@ -921,7 +920,8 @@ /* Prototypes needed to get a clean compile with gcc -Wall. * Believe it or not, these do have to be declared, at least on SunOS, * because they aren't mentioned in the relevant system headers. - * Sun Quality Software. Gotta love it. + * Sun Quality Software. Gotta love it. This section is not + * currently (13Nov97) used. */ int getopt(int, char **, char *);