[mapguide-commits] r1334 - trunk/MgDev/Oem/php/main

[svn_mapguide at osgeo.org]

Author: trevorwekel
Date: 2007-03-21 18:53:32 -0400 (Wed, 21 Mar 2007)
New Revision: 1334

Modified:
   trunk/MgDev/Oem/php/main/php.h
Log:
PHP 5.2.1 Upgrade - MapGuide patch for new sources

Modified: trunk/MgDev/Oem/php/main/php.h
===================================================================
--- trunk/MgDev/Oem/php/main/php.h	2007-03-21 22:48:55 UTC (rev 1333)
+++ trunk/MgDev/Oem/php/main/php.h	2007-03-21 22:53:32 UTC (rev 1334)
@@ -45,8 +45,10 @@
 #define PHP_DEBUG ZEND_DEBUG
 
 #ifdef PHP_WIN32
+#ifndef PHPPROXYAPI_EXPORTS
 #include "tsrm_win32.h"
 #include "win95nt.h"
+#endif
 #	ifdef PHP_EXPORTS
 #	define PHPAPI __declspec(dllexport)
 #	else
@@ -71,7 +73,9 @@
 #define PHP_OS      PHP_UNAME
 #endif
 
+#ifndef PHPPROXYAPI_EXPORTS
 #include "php_regex.h"
+#endif
 
 #if HAVE_ASSERT_H
 #if PHP_DEBUG
@@ -143,9 +147,11 @@
 END_EXTERN_C()
 #endif
 
+#ifndef PHPPROXYAPI_EXPORTS
 #ifndef HAVE_SOCKLEN_T
 typedef unsigned int socklen_t;
 #endif
+#endif
 
 #define CREATE_MUTEX(a, b)
 #define SET_MUTEX(a)
@@ -406,7 +412,9 @@
 
 
 /* Virtual current working directory support */
+#ifndef PHPPROXYAPI_EXPORTS
 #include "tsrm_virtual_cwd.h"
+#endif
 
 #include "zend_constants.h"