[gentoo-commits] gentoo-x86 commit in dev-php/igbinary/files: zts-fix.patch

[gentoo-commits] gentoo-x86 commit in dev-php/igbinary/files: zts-fix.patch

[Ole Markus With (olemarkus)]

olemarkus    13/04/01 07:32:34

  Added:                zts-fix.patch
  Log:
  Fix ZTS build. Bug 435742
  
  (Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key C4A92BF5)

Revision  Changes    Path
1.1                  dev-php/igbinary/files/zts-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/igbinary/files/zts-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/igbinary/files/zts-fix.patch?rev=1.1&content-type=text/plain

Index: zts-fix.patch
===================================================================
--- a/apc_serializer.h
+++ b/apc_serializer.h
@@ -32,29 +32,37 @@
 typedef int (*apc_serialize_t)(APC_SERIALIZER_ARGS);
 typedef int (*apc_unserialize_t)(APC_UNSERIALIZER_ARGS);
 
-typedef int (*apc_register_serializer_t)(const char* name, 
-                                        apc_serialize_t serialize, 
+typedef int (*apc_register_serializer_t)(const char* name,
+                                        apc_serialize_t serialize,
                                         apc_unserialize_t unserialize,
                                         void *config TSRMLS_DC);
 
 /*
  * ABI version for constant hooks. Increment this any time you make any changes 
  * to any function in this file.
  */
 #define APC_SERIALIZER_ABI "0"
 #define APC_SERIALIZER_CONSTANT "\000apc_register_serializer-" APC_SERIALIZER_ABI
 
-static int apc_register_serializer(const char* name, 
+#if !defined(APC_UNUSED)
+# if defined(__GNUC__)
+#  define APC_UNUSED __attribute__((unused))
+# else
+# define APC_UNUSED
+# endif
+#endif
+
+static APC_UNUSED int apc_register_serializer(const char* name,
                                     apc_serialize_t serialize,
                                     apc_unserialize_t unserialize,
                                     void *config TSRMLS_DC)
 {
     zval *apc_magic_constant = NULL;
     (void)config;
     
     ALLOC_INIT_ZVAL(apc_magic_constant);
 
-    if (zend_get_constant(APC_SERIALIZER_CONSTANT, sizeof(APC_SERIALIZER_CONSTANT)-1, apc_magic_constant)) { 
+    if (zend_get_constant(APC_SERIALIZER_CONSTANT, sizeof(APC_SERIALIZER_CONSTANT)-1, apc_magic_constant TSRMLS_CC)) {
         if(apc_magic_constant) {
             apc_register_serializer_t register_func = (apc_register_serializer_t)(Z_LVAL_P(apc_magic_constant));
             if(register_func) {