SOURCES: graphviz-php.patch - old one obsolete, new fixes for grap...

[qboosh]

Author: qboosh                       Date: Sat Feb 11 23:13:40 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- old one obsolete, new fixes for graphviz 2.8

---- Files affected:
SOURCES:
   graphviz-php.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/graphviz-php.patch
diff -u SOURCES/graphviz-php.patch:1.1 SOURCES/graphviz-php.patch:1.2
--- SOURCES/graphviz-php.patch:1.1	Sat Jul 23 11:05:32 2005
+++ SOURCES/graphviz-php.patch	Sun Feb 12 00:13:35 2006
@@ -1,11 +1,40 @@
---- graphviz-2.4/tclpkg/gv/gv_php.cpp.orig	2005-07-20 22:45:14.000000000 +0200
-+++ graphviz-2.4/tclpkg/gv/gv_php.cpp	2005-07-23 10:43:25.023342416 +0200
-@@ -697,7 +697,7 @@
-   p = value->ptr;
-   if (type==-1) return -1;
+--- graphviz-2.8/tclpkg/gv/gv_php.cpp.orig	2006-02-03 23:38:22.000000000 +0100
++++ graphviz-2.8/tclpkg/gv/gv_php.cpp	2006-02-11 20:13:04.627942250 +0100
+@@ -704,8 +704,9 @@
+   swig_module_info *ret = 0;
  
--  type_name=zend_rsrc_list_get_rsrc_type(z->value.lval);
-+  type_name=zend_rsrc_list_get_rsrc_type(z->value.lval TSRMLS_CC);
+   MAKE_STD_ZVAL(pointer);
++  TSRMLS_FETCH();
  
-   return SWIG_ZTS_ConvertResourceData(p,type,type_name,ptr,ty TSRMLS_CC);
+-  if (zend_get_constant(const_name, sizeof(const_name), pointer)) {
++  if (zend_get_constant(const_name, sizeof(const_name), pointer TSRMLS_CC)) {
+     if (pointer->type == IS_LONG) {
+       ret = (swig_module_info *) pointer->value.lval;
+     }
+@@ -714,6 +715,7 @@
+ }
+ 
+ static void SWIG_Php4_SetModule(swig_module_info *pointer) {
++  TSRMLS_FETCH();
+   REGISTER_MAIN_LONG_CONSTANT(const_name, (long) pointer, 0);
+ }
+ 
+@@ -759,8 +761,8 @@
+ ZEND_END_MODULE_GLOBALS(gv)
+ ZEND_DECLARE_MODULE_GLOBALS(gv)
+ #ifdef ZTS
+-#define ErrorMsg() TSRMG(gv_globals_id, zend_gv_globals *, error_msg );
+-#define ErrorCode() TSRMG(gv_globals_id, zend_gv_globals *, error_code );
++#define ErrorMsg() TSRMG(gv_globals_id, zend_gv_globals *, error_msg )
++#define ErrorCode() TSRMG(gv_globals_id, zend_gv_globals *, error_code )
+ #else
+ #define ErrorMsg() (gv_globals.error_msg)
+ #define ErrorCode() (gv_globals.error_code)
+@@ -773,6 +775,7 @@
+ static void gv_destroy_globals(zend_gv_globals *gv_globals) { }
+ 
+ void SWIG_ResetError() {
++  TSRMLS_FETCH();
+   ErrorMsg() = default_error_msg;
+   ErrorCode() = default_error_code;
  }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/graphviz-php.patch?r1=1.1&r2=1.2&f=u