]> granicus.if.org Git - php/commitdiff
move to in between BEGIN_EXTERN_C() block, to avoid breakage with C++ (i.e. windows)
authorGreg Beaver <cellog@php.net>
Fri, 1 Feb 2008 22:23:37 +0000 (22:23 +0000)
committerGreg Beaver <cellog@php.net>
Fri, 1 Feb 2008 22:23:37 +0000 (22:23 +0000)
# david, can you check on mac to be sure this doesn't break?

ext/phar/phar_internal.h

index 5d453de379006148987a4a8866d34995f93e532b..3e28299ec8d0bf448bf975efe584b7ceb02ad1a6 100755 (executable)
@@ -168,9 +168,6 @@ ZEND_END_MODULE_GLOBALS(phar)
 
 ZEND_EXTERN_MODULE_GLOBALS(phar)
 
-extern int phar_has_bz2;
-extern int phar_has_zlib;
-
 #ifdef ZTS
 #      include "TSRM.h"
 #      define PHAR_G(v) TSRMG(phar_globals_id, zend_phar_globals *, v)
@@ -330,6 +327,10 @@ union _phar_entry_object {
 #endif
 
 BEGIN_EXTERN_C()
+
+int phar_has_bz2;
+int phar_has_zlib;
+
 #ifdef PHP_WIN32
 char *tsrm_strtok_r(char *s, const char *delim, char **last);