Skip to content

Commit b0620b2

Browse files
committed
Rename header to prevent name clashes with external files
1 parent a7974a8 commit b0620b2

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ext/simplexml/simplexml.h renamed to ext/simplexml/php_simplexml_exports.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
/* $Id$ */
2222

23-
#ifndef _SIMPLEXML_H_
24-
#define _SIMPLEXML_H_
23+
#ifndef PHP_SIMPLEXML_EXPORTS_H
24+
#define PHP_SIMPLEXML_EXPORTS_H
2525

2626
#include "php_simplexml.h"
2727

@@ -52,7 +52,7 @@ php_sxe_fetch_object(zval *object TSRMLS_DC)
5252
ZEND_API void php_sxe_reset_iterator(php_sxe_object *sxe TSRMLS_DC);
5353
ZEND_API void php_sxe_move_forward_iterator(php_sxe_object *sxe TSRMLS_DC);
5454

55-
#endif /* _SIMPLEXML_H_ */
55+
#endif /* PHP_SIMPLEXML_EXPORTS_H */
5656

5757
/**
5858
* Local Variables:

ext/simplexml/simplexml.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "ext/standard/info.h"
3232
#include "ext/standard/php_string.h"
3333
#include "php_simplexml.h"
34-
#include "simplexml.h"
34+
#include "php_simplexml_exports.h"
3535
#include "zend_default_classes.h"
3636
#include "zend_interfaces.h"
3737
#if HAVE_SPL && !defined(COMPILE_DL_SPL)

ext/spl/spl_sxe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ zend_class_entry *spl_ce_SimpleXMLIterator = NULL;
3535

3636
#if HAVE_LIBXML && HAVE_SIMPLEXML
3737

38-
#include "ext/simplexml/simplexml.h"
38+
#include "ext/simplexml/php_simplexml_exports.h"
3939

4040
SPL_METHOD(SimpleXMLIterator, rewind) /* {{{ */
4141
{

0 commit comments

Comments
 (0)