From: William A. Rowe Jr <wrowe@apache.org>
Date: Tue, 1 Jun 2004 16:43:37 +0000 (+0000)
Subject:   If XtOffsetOf() is already defined, don't redefine.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b093f7142f428254fc63f788f7a95b04141efbbc;p=thirdparty%2Fapache%2Fhttpd.git

  If XtOffsetOf() is already defined, don't redefine.
  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
---

diff --git a/src/include/ap_config.h b/src/include/ap_config.h
index cde5cccd96c..11c3c9b68df 100644
--- a/src/include/ap_config.h
+++ b/src/include/ap_config.h
@@ -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