From: Greg Beaver <cellog@php.net>
Date: Fri, 1 Feb 2008 22:23:37 +0000 (+0000)
Subject: move to in between BEGIN_EXTERN_C() block, to avoid breakage with C++ (i.e. windows)
X-Git-Tag: RELEASE_2_0_0a1~663
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9af8b12b2b91a3ce19c82deb598d0a93ef26f368;p=php

move to in between BEGIN_EXTERN_C() block, to avoid breakage with C++ (i.e. windows)

# david, can you check on mac to be sure this doesn't break?
---

diff --git a/ext/phar/phar_internal.h b/ext/phar/phar_internal.h
index 5d453de379..3e28299ec8 100755
--- a/ext/phar/phar_internal.h
+++ b/ext/phar/phar_internal.h
@@ -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);