fix folding tags, nuke json globals

diff --git a/ext/json/json.c b/ext/json/json.c
index 6f4571241d1727b33352e2007bae3465e28b4d24..20c3d72434eac048d03c81f40280c9a0969e0b87 100644 (file)
--- a/ext/json/json.c
+++ b/ext/json/json.c
@@ -30,9 +30,6 @@
 #include "JSON_parser.h"
 #include "php_json.h"
 
-/* If you declare any globals in php_json.h uncomment this:
-ZEND_DECLARE_MODULE_GLOBALS(json)
-*/
 static const char digits[] = "0123456789abcdef";
 
 /* {{{ json_functions[]
@@ -84,7 +81,8 @@ PHP_MINFO_FUNCTION(json)
 static void json_encode_r(smart_str *buf, zval *val TSRMLS_DC);
 static void json_escape_string(smart_str *buf, zstr s, int len, zend_uchar type);
 
-static int json_determine_array_type(zval **val TSRMLS_DC) {
+static int json_determine_array_type(zval **val TSRMLS_DC) /* {{{ */
+{
     int i;
     HashTable *myht;
 
@@ -122,8 +120,10 @@ static int json_determine_array_type(zval **val TSRMLS_DC) {
 
     return 0;
 }
+/* }}} */
 
-static void json_encode_array(smart_str *buf, zval **val TSRMLS_DC) {
+static void json_encode_array(smart_str *buf, zval **val TSRMLS_DC) /* {{{ */
+{
     int i, r;
     HashTable *myht;
 
@@ -230,10 +230,11 @@ static void json_encode_array(smart_str *buf, zval **val TSRMLS_DC) {
         smart_str_appendc(buf, '}');
     }
 }
+/* }}} */
 
 #define REVERSE16(us) (((us & 0xf) << 12) | (((us >> 4) & 0xf) << 8) | (((us >> 8) & 0xf) << 4) | ((us >> 12) & 0xf))
 
-static void json_escape_string(smart_str *buf, zstr s, int len, zend_uchar type)
+static void json_escape_string(smart_str *buf, zstr s, int len, zend_uchar type) /* {{{ */
 {
     int pos = 0;
     unsigned short us;
@@ -341,8 +342,10 @@ static void json_escape_string(smart_str *buf, zstr s, int len, zend_uchar type)
                efree(utf16);
        }
 }
+/* }}} */
 
-static void json_encode_r(smart_str *buf, zval *val TSRMLS_DC) {
+static void json_encode_r(smart_str *buf, zval *val TSRMLS_DC) /* {{{ */
+{
     switch (Z_TYPE_P(val)) {
         case IS_NULL:
             smart_str_appendl(buf, "null", 4);
@@ -398,6 +401,7 @@ static void json_encode_r(smart_str *buf, zval *val TSRMLS_DC) {
 
     return;
 }
+/* }}} */
 
 /* {{{ proto string json_encode(mixed data) U
    Returns the JSON representation of a value */
@@ -416,6 +420,7 @@ PHP_FUNCTION(json_encode)
 
     smart_str_free(&buf);
 }
+/* }}} */
 
 /* {{{ proto mixed json_decode(string json [, bool assoc]) U
    Decodes the JSON representation into a PHP value */
@@ -525,6 +530,7 @@ PHP_FUNCTION(json_decode)
                }
        }
 }
+/* }}} */
 
 /*
  * Local variables:

diff --git a/ext/json/php_json.h b/ext/json/php_json.h
index 48555ee31f2bdfbfbea1c5ddffe3914d14794a62..f5e28b81129ac64c9f22ffa58f730d5a14469b7a 100644 (file)
--- a/ext/json/php_json.h
+++ b/ext/json/php_json.h
@@ -41,15 +41,8 @@ PHP_MINFO_FUNCTION(json);
 PHP_FUNCTION(json_encode);
 PHP_FUNCTION(json_decode);
 
-#ifdef ZTS
-#define JSON_G(v) TSRMG(json_globals_id, zend_json_globals *, v)
-#else
-#define JSON_G(v) (json_globals.v)
-#endif
-
 #endif  /* PHP_JSON_H */
 
-
 /*
  * Local variables:
  * tab-width: 4