fix macro + nuke warning

diff --git a/sapi/apache/mod_php4.h b/sapi/apache/mod_php4.h
index cb9ce7701c48ffaff833609952cab008475bc4fa..fa4adaedf96c62f98dd4281a2f63f4fde33b73e6 100644 (file)
--- a/sapi/apache/mod_php4.h
+++ b/sapi/apache/mod_php4.h
@@ -38,17 +38,12 @@ extern zend_module_entry apache_module_entry;
 
 #ifdef ZTS
 extern int php_apache_info_id;
-#define AP(v) TSRMG(alloc_globals_id, php_apache_info_struct *, v)
+#define AP(v) TSRMG(php_apache_info_id, php_apache_info_struct *, v)
 #else
 extern php_apache_info_struct php_apache_info;
 #define AP(v) (php_apache_info.v)
 #endif
 
-
-#ifdef WIN32
-#define S_IXUSR _S_IEXEC
-#endif
-
 #endif                                                 /* MOD_PHP4_H */
 
 /*