Rename header to prevent name clashes with external files

diff --git a/ext/simplexml/simplexml.h b/ext/simplexml/php_simplexml_exports.h
similarity index 95%
rename from ext/simplexml/simplexml.h
rename to ext/simplexml/php_simplexml_exports.h
index 6b2234cd10986af7603722187b57fc126e7bbbb2..6d6e7b8baf542a3b4f6780af20c2675f99598847 100755 (executable)
--- a/ext/simplexml/simplexml.h
+++ b/ext/simplexml/php_simplexml_exports.h
@@ -20,8 +20,8 @@
 
 /* $Id$ */
 
-#ifndef _SIMPLEXML_H_
-#define _SIMPLEXML_H_
+#ifndef PHP_SIMPLEXML_EXPORTS_H
+#define PHP_SIMPLEXML_EXPORTS_H
 
 #include "php_simplexml.h"
 
@@ -52,7 +52,7 @@ php_sxe_fetch_object(zval *object TSRMLS_DC)
 ZEND_API void php_sxe_reset_iterator(php_sxe_object *sxe TSRMLS_DC);
 ZEND_API void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC);
 
-#endif /* _SIMPLEXML_H_ */
+#endif /* PHP_SIMPLEXML_EXPORTS_H */
 
 /**
  * Local Variables:

diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 71e546979598c8b727b0495fcc0d683cc06ea40c..0de4f05fd4beab2c8bd28c8ef177a5c89902096d 100644 (file)
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -31,7 +31,7 @@
 #include "ext/standard/info.h"
 #include "ext/standard/php_string.h"
 #include "php_simplexml.h"
-#include "simplexml.h"
+#include "php_simplexml_exports.h"
 #include "zend_default_classes.h"
 #include "zend_interfaces.h"
 #if HAVE_SPL && !defined(COMPILE_DL_SPL)

diff --git a/ext/spl/spl_sxe.c b/ext/spl/spl_sxe.c
index 6d856cc87625d45cc4656cd0e9190629911f75ce..791de4ef90f97e67e130dbb014cfdb9287a7019a 100755 (executable)
--- a/ext/spl/spl_sxe.c
+++ b/ext/spl/spl_sxe.c
@@ -35,7 +35,7 @@ zend_class_entry *spl_ce_SimpleXMLIterator = NULL;
 
 #if HAVE_LIBXML && HAVE_SIMPLEXML
 
-#include "ext/simplexml/simplexml.h"
+#include "ext/simplexml/php_simplexml_exports.h"
 
 SPL_METHOD(SimpleXMLIterator, rewind) /* {{{ */
 {