martin 98/01/09 07:49:57
Modified: . Tag: APACHE_1_2_X STATUS
src Tag: APACHE_1_2_X buff.h
Log:
Avoid redefinition warnings for B_ERROR on SVR4 systems.
Reviewed by: Jim Jagielski, Dean Gaudet
Revision Changes Path
No revision
No revision
1.1.2.5 +1 -4 apache/Attic/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apache/Attic/STATUS,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -u -r1.1.2.4 -r1.1.2.5
--- STATUS 1998/01/09 15:13:40 1.1.2.4
+++ STATUS 1998/01/09 15:49:39 1.1.2.5
@@ -6,6 +6,7 @@
* Martins portability change for ReliantUNIX/SINIX (_XPG_IV switch)
* Martin's [PATCH]-1.2.6: passing escaped CC='$(CC)'
+ * Martin's [PATCH]-1.2.6: avoid B_ERROR redeclaration
Available:
@@ -35,10 +36,6 @@
* Mark Bixby's MPE port patch
<[EMAIL PROTECTED]>
Status: Mark +1, Dean +1
-
- * Martin's [PATCH]-1.2.6: avoid B_ERROR redeclaration (was: Re: STATUS:
1.2)
- <[EMAIL PROTECTED]>
- Status: Martin +1, Jim +1, Dean +1
Needs patch:
No revision
No revision
1.12.2.1 +3 -0 apache/src/buff.h
Index: buff.h
===================================================================
RCS file: /home/cvs/apache/src/buff.h,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -u -r1.12 -r1.12.2.1
--- buff.h 1997/02/10 15:49:54 1.12
+++ buff.h 1998/01/09 15:49:56 1.12.2.1
@@ -65,6 +65,9 @@
#define B_RDERR (16)
/* A write error has occurred */
#define B_WRERR (32)
+#ifdef B_ERROR /* in SVR4: sometimes defined in /usr/include/sys/buf.h */
+#undef B_ERROR /* avoid "warning: `B_ERROR' redefined" */
+#endif
#define B_ERROR (48)
/* Use chunked writing */
#define B_CHUNK (64)
