[Another patch already in use, to be applied Tuesday unless someone speaks up.]
We've found cases where XtOffsetOf is already defined on some platforms - we have no business overriding this (if we wanted our own flavor, it aught to have been AP_ prefixed :-) Bill
# # Some platforms have an XtOffsetOf macro already defined, # since we didn't namespace protect our flavor, use the # already-defined flavor. # --- src/include/ap_config.h 29 Mar 2004 17:33:52 -0000 1.336 +++ src/include/ap_config.h 17 May 2004 17:03:19 -0000 @@ -1365,10 +1365,12 @@ #endif /* !CRAY */ +#ifndef XtOffsetOf #ifdef offsetof #define XtOffsetOf(s_type,field) offsetof(s_type,field) #else #define XtOffsetOf(s_type,field) XtOffset(s_type*,field) +#endif #endif /*
