]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
If XtOffsetOf() is already defined, don't redefine.
authorWilliam A. Rowe Jr <wrowe@apache.org>
Tue, 1 Jun 2004 16:43:37 +0000 (16:43 +0000)
committerWilliam A. Rowe Jr <wrowe@apache.org>
Tue, 1 Jun 2004 16:43:37 +0000 (16:43 +0000)
  When we need our own flavor, it must be namespace
  protected.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@103813 13f79535-47bb-0310-9956-ffa450edef68

src/include/ap_config.h

index cde5cccd96ca85aa08b1a9b68df537d3eec0812e..11c3c9b68df0661f8efdaaea39e66d9f834ee7e8 100644 (file)
@@ -1362,11 +1362,13 @@ extern int ap_execve(const char *filename, char * const argv[],
 
 #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
 
 /*
  * NET_SIZE_T exists because of shortsightedness on the POSIX committee.  BSD