cvs: php4 /main php.h
| From: | Sterling Hughes | Date: | Sat, 18 Aug 2001 02:08:29 +0000 |
| Subject: | cvs: php4 /main php.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6929@lists.php.net to get a copy of this message | ||
sterling Fri Aug 17 22:08:29 2001 EDT
Modified files:
/php4/main php.h
Log:
Fix XtOffsetOf compile problems if someone has already defined it.
Index: php4/main/php.h
diff -u php4/main/php.h:1.152 php4/main/php.h:1.153
--- php4/main/php.h:1.152 Fri Aug 10 21:13:31 2001
+++ php4/main/php.h Fri Aug 17 22:08:29 2001
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php.h,v 1.152 2001/08/11 01:13:31 zeev Exp $ */
+/* $Id: php.h,v 1.153 2001/08/18 02:08:29 sterling Exp $ */
#ifndef PHP_H
#define PHP_H
@@ -315,6 +315,7 @@
* 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 @@
((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