[PHP-CVS] cvs: php-src(PHP_5_3) /ext/json php_json.h

2009-05-31 Thread Andrei Zmievski 
andrei  Sun May 31 18:55:10 2009 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/json   php_json.h 
  Log:
  Fix the build.
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/php_json.h?r1=1.8.2.2.2.6&r2=1.8.2.2.2.7&diff_format=u
Index: php-src/ext/json/php_json.h
diff -u php-src/ext/json/php_json.h:1.8.2.2.2.6 
php-src/ext/json/php_json.h:1.8.2.2.2.7
--- php-src/ext/json/php_json.h:1.8.2.2.2.6 Sun May 31 01:44:07 2009
+++ php-src/ext/json/php_json.h Sun May 31 18:55:10 2009
@@ -16,12 +16,13 @@
   +--+
 */
 
-/* $Id: php_json.h,v 1.8.2.2.2.6 2009/05/31 01:44:07 andrei Exp $ */
+/* $Id: php_json.h,v 1.8.2.2.2.7 2009/05/31 18:55:10 andrei Exp $ */
 
 #ifndef PHP_JSON_H
 #define PHP_JSON_H
 
 #define PHP_JSON_VERSION "1.2.1"
+#include "ext/standard/php_smart_str.h"
 
 extern zend_module_entry json_module_entry;
 #define phpext_json_ptr &json_module_entry



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src(PHP_5_3) /ext/json php_json.h

2008-07-22 Thread Jani Taskinen 
janiTue Jul 22 14:57:46 2008 UTC

  Modified files:  (Branch: PHP_5_3)
/php-src/ext/json   php_json.h 
  Log:
  MFH: unused stuff
  
http://cvs.php.net/viewvc.cgi/php-src/ext/json/php_json.h?r1=1.8.2.2.2.2&r2=1.8.2.2.2.3&diff_format=u
Index: php-src/ext/json/php_json.h
diff -u php-src/ext/json/php_json.h:1.8.2.2.2.2 
php-src/ext/json/php_json.h:1.8.2.2.2.3
--- php-src/ext/json/php_json.h:1.8.2.2.2.2 Thu Jan  3 16:20:31 2008
+++ php-src/ext/json/php_json.h Tue Jul 22 14:57:46 2008
@@ -16,7 +16,7 @@
   +--+
 */
 
-/* $Id: php_json.h,v 1.8.2.2.2.2 2008/01/03 16:20:31 nlopess Exp $ */
+/* $Id: php_json.h,v 1.8.2.2.2.3 2008/07/22 14:57:46 jani Exp $ */
 
 #ifndef PHP_JSON_H
 #define PHP_JSON_H
@@ -30,15 +30,8 @@
 #include "TSRM.h"
 #endif
 
-#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



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php