rse 98/04/28 01:19:51
Modified: . STATUS
src CHANGES Configure
src/include conf.h
Log:
Fix nasty compiler warnings under AIX 4.2 because there we need
NET_SIZE_T=size_t according to the include files and not NET_SIZE_T=int as the
manual pages of getsockname() etc. indicate.
Revision Changes Path
1.340 +1 -0 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.339
retrieving revision 1.340
diff -u -r1.339 -r1.340
--- STATUS 1998/04/28 08:13:06 1.339
+++ STATUS 1998/04/28 08:19:47 1.340
@@ -74,6 +74,7 @@
* Ralf's more granular install paths: runtimedir, logfiledir,
proxycachedir
* Roy's bugfixes for select() handling
* Martin's suppress "error(0)" messages for ap_log_error()
+ * Ralf's fixes for compiler warnings under AIX 4.2 (NET_SIZE_T is size_t)
Available Patches:
1.802 +4 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.801
retrieving revision 1.802
diff -u -r1.801 -r1.802
--- CHANGES 1998/04/28 05:59:48 1.801
+++ CHANGES 1998/04/28 08:19:47 1.802
@@ -1,5 +1,9 @@
Changes with Apache 1.3b7
+ *) PORT: Fix compiler warnings under AIX >= 4.2 where the manual pages
imply
+ that we should use NET_SIZE_T == int but the include files force size_t.
+ [Ralf S. Engelschall]
+
*) Fix two bugs in select() handling in http_main.c.
[Roy Fielding]
1.248 +3 -3 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- Configure 1998/04/27 08:17:26 1.247
+++ Configure 1998/04/28 08:19:48 1.248
@@ -305,16 +305,16 @@
;;
i386-ibm-aix*)
OS='IBM AIX PS/2'
- CFLAGS="$CFLAGS -DAIX -U__STR__ -DUSEBCOPY"
+ CFLAGS="$CFLAGS -DAIX=1 -U__STR__ -DUSEBCOPY"
DEF_WANTHSREGEX=no
;;
*-ibm-aix[1-3].*|*-ibm-aix4.[0-1])
OS='IBM AIX < v4.2'
- CFLAGS="$CFLAGS -DAIX -DNEED_RLIM_T -U__STR__"
+ CFLAGS="$CFLAGS -DAIX=1 -DNEED_RLIM_T -U__STR__"
;;
*-ibm-aix*)
OS='IBM AIX >= 4.2'
- CFLAGS="$CFLAGS -DAIX -U__STR__"
+ CFLAGS="$CFLAGS -DAIX=42 -U__STR__"
LDFLAGS="$LDFLAGS -lm"
;;
*-apollo-*)
1.203 +3 -0 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.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- conf.h 1998/04/20 23:49:08 1.202
+++ conf.h 1998/04/28 08:19:49 1.203
@@ -250,6 +250,9 @@
#ifdef USEBCOPY
#define memmove(a,b,c) bcopy(b,a,c)
#endif
+#if AIX >= 42
+#define NET_SIZE_T size_t
+#endif
#elif defined(ULTRIX)
#define HAVE_GMTOFF 1
