diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-02-08 14:08:31 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-02-08 14:08:31 +0000 |
| commit | f2825042b4dd9aa941a080c027f15f41c1b9e4bc (patch) | |
| tree | 2e7d97c1dfd4aeabb506ffdd206a612b82adea8d /ext/xmlreader/php_xmlreader.h | |
| parent | 0a81f9a0bd36deac8707949acbcf92f612b60e8e (diff) | |
| parent | ce9f52adcdfb19f70dc4274f3587e58ac07995bd (diff) | |
| download | php-git-f2825042b4dd9aa941a080c027f15f41c1b9e4bc.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/json.c
Diffstat (limited to 'ext/xmlreader/php_xmlreader.h')
| -rw-r--r-- | ext/xmlreader/php_xmlreader.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/xmlreader/php_xmlreader.h b/ext/xmlreader/php_xmlreader.h index 47fbccf488..e07c126c8e 100644 --- a/ext/xmlreader/php_xmlreader.h +++ b/ext/xmlreader/php_xmlreader.h @@ -31,6 +31,14 @@ extern zend_module_entry xmlreader_module_entry; #include "ext/libxml/php_libxml.h" #include <libxml/xmlreader.h> +/* If xmlreader and dom both are compiled statically, + no DLL import should be used in xmlreader for dom symbols. */ +#ifdef PHP_WIN32 +# if defined(HAVE_DOM) && !defined(COMPILE_DL_DOM) +# define DOM_LOCAL_DEFINES 1 +# endif +#endif + typedef struct _xmlreader_object { xmlTextReaderPtr ptr; /* strings must be set in input buffer as copy is required */ |