From: Sterling Hughes <sterling@php.net>
Date: Sat, 18 Aug 2001 02:08:29 +0000 (+0000)
Subject: Fix XtOffsetOf compile problems if someone has already defined it.
X-Git-Tag: PRE_SUBST_Z_MACROS~461
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15b1e4ba9c4d7ee231d9c17ced2d63d8a89ad1ce;p=php

Fix XtOffsetOf compile problems if someone has already defined it.
---

diff --git a/main/php.h b/main/php.h
index bab959ed9a..a637859944 100644
--- a/main/php.h
+++ b/main/php.h
@@ -315,6 +315,7 @@ PHPAPI int cfg_get_string(char *varname, char **result);
  * Taken from the Apache code, which in turn, was taken from X code...
  */
 
+#ifndef XtOffset
 #if defined(CRAY) || (defined(__arm) && !defined(LINUX))
 #ifdef __STDC__
 #define XtOffset(p_type, field) _Offsetof(p_type, field)
@@ -335,13 +336,16 @@ PHPAPI int cfg_get_string(char *varname, char **result);
     ((long) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
 
 #endif /* !CRAY */
+#endif /* ! XtOffset */
 
+#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 /* !XtOffsetOf */
+	
 PHPAPI PHP_FUNCTION(warn_not_available);
 
 #endif