You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ra...@hyperreal.org on 1999/01/04 05:13:14 UTC
cvs commit: apache-1.3/src/support ab.c
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;
}
Re: cvs commit: apache-1.3/src/support ab.c
Posted by Ben Laurie <be...@algroup.co.uk>.
Randy Terbush wrote:
>
> Jean-Claude MICHOT <jc...@teaser.fr> writes:
> > On Mon, Jan 04, 1999 at 10:51:45PM +0000, Ben Laurie wrote:
> > > randy@hyperreal.org wrote:
> > > > 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'
> > >
> > > Shouldn't the -F go in CFLAGS?
> >
> > It should. (-F is use to force objects to be
> > placed in same directory as the src).
>
> As long as we are using CFLAGS when doing the test compile for ANSI
> compliance, then that would work. That was the point of failure.
Whether we are or not, clearly we _should_ be!
Cheers,
Ben.
--
http://www.apache-ssl.org/ben.html
"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
- Indira Gandhi
Re: cvs commit: apache-1.3/src/support ab.c
Posted by Randy Terbush <ra...@Covalent.NET>.
Jean-Claude MICHOT <jc...@teaser.fr> writes:
> On Mon, Jan 04, 1999 at 10:51:45PM +0000, Ben Laurie wrote:
> > randy@hyperreal.org wrote:
> > > 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'
> >
> > Shouldn't the -F go in CFLAGS?
>
> It should. (-F is use to force objects to be
> placed in same directory as the src).
As long as we are using CFLAGS when doing the test compile for ANSI
compliance, then that would work. That was the point of failure.
> With Qnx4, I use gcc or egcs instead of old Watcom C 10.6,
> it seem that fix few Qnx arguments problems.
>
> > > OS='QNX32'
> > > CFLAGS="$CFLAGS -DQNX -mf -3"
>
> In all case with Watcom CC it seem a good idea to compile
> with "-3s" instead of "-3".
>
> > > LIBS="$LIBS -N128k -lsocket -lunix"
>
> --
> Jean-Claude MICHOT, France-Teaser, http://www.teaser.fr jcmichot@teaser.fr
> "We've all heard that a million monkeys banging on a million
> typewriters will eventually reproduce the works of Shakespeare.
> Now, thanks to the Internet, we know this is not true."
Re: cvs commit: apache-1.3/src/support ab.c
Posted by Jean-Claude MICHOT <jc...@teaser.fr>.
On Mon, Jan 04, 1999 at 10:51:45PM +0000, Ben Laurie wrote:
> randy@hyperreal.org wrote:
> > 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'
>
> Shouldn't the -F go in CFLAGS?
It should. (-F is use to force objects to be
placed in same directory as the src).
With Qnx4, I use gcc or egcs instead of old Watcom C 10.6,
it seem that fix few Qnx arguments problems.
> > OS='QNX32'
> > CFLAGS="$CFLAGS -DQNX -mf -3"
In all case with Watcom CC it seem a good idea to compile
with "-3s" instead of "-3".
> > LIBS="$LIBS -N128k -lsocket -lunix"
--
Jean-Claude MICHOT, France-Teaser, http://www.teaser.fr jcmichot@teaser.fr
"We've all heard that a million monkeys banging on a million
typewriters will eventually reproduce the works of Shakespeare.
Now, thanks to the Internet, we know this is not true."
Re: cvs commit: apache-1.3/src/support ab.c
Posted by Ben Laurie <be...@algroup.co.uk>.
randy@hyperreal.org wrote:
> 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'
Shouldn't the -F go in CFLAGS?
> OS='QNX32'
> CFLAGS="$CFLAGS -DQNX -mf -3"
> LIBS="$LIBS -N128k -lsocket -lunix"
Cheers,
Ben.
--
http://www.apache-ssl.org/ben.html
"My grandfather once told me that there are two kinds of people: those
who work and those who take the credit. He told me to try to be in the
first group; there was less competition there."
- Indira Ghandi