randy 99/01/03 20:13:14
Modified: src Configure
Log:
Portability fixes for QNX32. This may also apply to QNX, but I cannot
verify that. /bin/sh is pathetic on this platform so configuration
still requires a replacement shell.
Revision Changes Path
1.319 +1 -0 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- Configure 1999/01/02 23:54:34 1.318
+++ Configure 1999/01/04 04:11:38 1.319
@@ -497,6 +497,7 @@
DEF_WANTHSREGEX=yes
;;
*-qnx32)
+ CC='cc -F'
OS='QNX32'
CFLAGS="$CFLAGS -DQNX -mf -3"
LIBS="$LIBS -N128k -lsocket -lunix"
Modified: src/support ab.c
Log:
Portability fixes for QNX32. This change seems to be the most
portable way to handle the conflict with this macro in other
included files.
Revision Changes Path
1.18 +6 -6 apache-1.3/src/support/ab.c
Index: ab.c
===================================================================
RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ab.c 1999/01/01 19:05:32 1.17
+++ ab.c 1999/01/04 04:13:13 1.18
@@ -155,8 +155,8 @@
int time; /* time in ms for connection */
};
-#define min(a,b) ((a)<(b))?(a):(b)
-#define max(a,b) ((a)>(b))?(a):(b)
+#define ap_min(a,b) ((a)<(b))?(a):(b)
+#define ap_max(a,b) ((a)>(b))?(a):(b)
/* --------------------- GLOBALS ---------------------------- */
@@ -320,10 +320,10 @@
for (i = 0; i < requests; i++) {
struct data s = stats[i];
- mincon = min(mincon, s.ctime);
- mintot = min(mintot, s.time);
- maxcon = max(maxcon, s.ctime);
- maxtot = max(maxtot, s.time);
+ mincon = ap_min(mincon, s.ctime);
+ mintot = ap_min(mintot, s.time);
+ maxcon = ap_max(maxcon, s.ctime);
+ maxtot = ap_max(maxtot, s.time);
totalcon += s.ctime;
total += s.time;
}
