dgaudet 98/06/04 12:58:58
Modified: src CHANGES src/main buff.c Log: PORT: F_NDELAY is a typo, should have been FNDELAY. There's also O_NDELAY on various systems. PR: 2313 Submitted by: Dave Dykstra <[EMAIL PROTECTED]> Revision Changes Path 1.884 +3 -0 apache-1.3/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v retrieving revision 1.883 retrieving revision 1.884 diff -u -r1.883 -r1.884 --- CHANGES 1998/06/04 19:49:25 1.883 +++ CHANGES 1998/06/04 19:58:54 1.884 @@ -1,5 +1,8 @@ Changes with Apache 1.3.1 + *) PORT: F_NDELAY is a typo, should have been FNDELAY. There's also + O_NDELAY on various systems. [Dave Dykstra <[EMAIL PROTECTED]>] PR#2313 + *) PORT: SVR4 v3.0.1 running on ncr S10 (3404) host. [juerg schreiner <[EMAIL PROTECTED]>] PR#2310 1.77 +4 -2 apache-1.3/src/main/buff.c Index: buff.c =================================================================== RCS file: /export/home/cvs/apache-1.3/src/main/buff.c,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- buff.c 1998/05/16 16:34:48 1.76 +++ buff.c 1998/06/04 19:58:57 1.77 @@ -529,8 +529,10 @@ fd = (direction == B_RD) ? fb->fd_in : fb->fd; #if defined(O_NONBLOCK) return fcntl(fd, F_SETFL, O_NONBLOCK); -#elif defined(F_NDELAY) - return fcntl(fd, F_SETFL, F_NDELAY); +#elif defined(O_NDELAY) + return fcntl(fd, F_SETFL, O_NDELAY); +#elif defined(FNDELAY) + return fcntl(fd, F_SETFL, FNDELAY); #else /* XXXX: this breaks things, but an alternative isn't obvious...*/ return 0;