jim 98/03/13 15:44:46
Modified: src Configure
src/include conf.h
src/main http_main.c
Log:
Change AUX -> AUX3 to avoid conflict with 'cc'
Revision Changes Path
1.207 +1 -1 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- Configure 1998/03/13 16:15:39 1.206
+++ Configure 1998/03/13 23:44:41 1.207
@@ -232,7 +232,7 @@
;;
*-apple-aux3*)
OS='A/UX 3.1.x'
- CFLAGS="$CFLAGS -DAUX -D_POSIX_SOURCE"
+ CFLAGS="$CFLAGS -DAUX3 -D_POSIX_SOURCE"
LIBS="$LIBS -lposix -lbsd"
LDFLAGS="$LDFLAGS -s"
DEF_WANTHSREGEX=no
1.190 +1 -1 apache-1.3/src/include/conf.h
Index: conf.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/conf.h,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -r1.189 -r1.190
--- conf.h 1998/03/08 04:25:56 1.189
+++ conf.h 1998/03/13 23:44:42 1.190
@@ -412,7 +412,7 @@
extern int strcasecmp(const char *, const char *);
extern int strncasecmp(const char *, const char *, unsigned);
-#elif defined(AUX)
+#elif defined(AUX3)
/* These are to let -Wall compile more cleanly */
extern int strcasecmp(const char *, const char *);
extern int strncasecmp(const char *, const char *, unsigned);
1.302 +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.301
retrieving revision 1.302
diff -u -r1.301 -r1.302
--- http_main.c 1998/03/13 13:28:17 1.301
+++ http_main.c 1998/03/13 23:44:44 1.302
@@ -2963,7 +2963,7 @@
*/
static void common_init(void)
{
-#ifdef AUX
+#ifdef AUX3
(void) set42sig();
#endif
