wrowe 2002/07/08 10:39:30
Modified: include apr_general.h
Log:
The native c offsetof() was conflicting when trying to use the APR_OFFSETOF
macros with c++ ... simply use our own implementation in that case.
Revision Changes Path
1.74 +1 -1 apr/include/apr_general.h
Index: apr_general.h
===================================================================
RCS file: /home/cvs/apr/include/apr_general.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- apr_general.h 8 Jun 2002 20:26:44 -0000 1.73
+++ apr_general.h 8 Jul 2002 17:39:29 -0000 1.74
@@ -144,7 +144,7 @@
* @param field data field within the structure
* @return offset
*/
-#ifdef offsetof
+#if defined(offsetof) && !defined(__cplusplus)
#define APR_OFFSETOF(s_type,field) offsetof(s_type,field)
#else
#define APR_OFFSETOF(s_type,field) APR_OFFSET(s_type*,field)
