Remove stray ZTS macros from codebase

meiyasan · Dec 28, 2020 · 912f242 · 912f242
1 parent 11d3ca8
commit 912f242
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/php-object.cpp b/php-object.cpp
@@ -66,7 +66,7 @@ zend_object_handlers php_git2::php_zend_object<StorageType>::handlers;
 // This function registers all classes. It should be called by the MINIT startup
 // function.
 
-void php_git2::php_git2_register_classes(TSRMLS_D)
+void php_git2::php_git2_register_classes()
 {
     zend_class_entry ce, *pce;
 

diff --git a/php-object.h b/php-object.h
@@ -17,8 +17,8 @@ extern "C" {
 
 // Helper macros
 
-#define is_subclass_of(a,b)                         \
-    (a == b || instanceof_function(a,b TSRMLS_CC))
+#define is_subclass_of(a,b)                     \
+    (a == b || instanceof_function(a,b))
 
 #define PHP_EMPTY_METHOD(C,M)                   \
     PHP_METHOD(C,M) { }

diff --git a/php-odb-backend.cpp b/php-odb-backend.cpp
@@ -881,7 +881,7 @@ ZEND_FUNCTION(backend_foreach_callback)
         php_bailout_context ctx(bailer);
 
         if (BAILOUT_ENTER_REGION(ctx)) {
-            ex.handle(TSRMLS_C);
+            ex.handle();
         }
     }
 }
@@ -923,7 +923,7 @@ ZEND_FUNCTION(backend_transfer_progress_callback)
         php_bailout_context ctx(bailer);
 
         if (BAILOUT_ENTER_REGION(ctx)) {
-            ex.handle(TSRMLS_C);
+            ex.handle();
         }
     }
 }

diff --git a/php-refdb-backend-internal.cpp b/php-refdb-backend-internal.cpp
@@ -410,7 +410,8 @@ PHP_METHOD(GitRefDBBackend_Internal,rename)
     }
 
     // Parse method parameters.
-    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,"ssba!s",
+    if (zend_parse_parameters(ZEND_NUM_ARGS(),
+            "ssba!s",
             &oldname,
             &oldname_len,
             &newname,
@@ -509,10 +510,10 @@ PHP_METHOD(GitRefDBBackend_Internal,del)
         }
 
     } catch (php_git2::php_git2_exception_base& ex) {
-        php_bailout_context ctx(bailer TSRMLS_CC);
+        php_bailout_context ctx(bailer);
 
         if (BAILOUT_ENTER_REGION(ctx)) {
-            ex.handle(TSRMLS_C);
+            ex.handle();
         }
     }
 }