[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pecl-cvs
Subject:    [PECL-CVS] com =?UTF-8?Q?pecl/database/ibm=5Fdb=32=3A=20Fix=20build=20on=20PHP=20=38?= =?UTF-8?Q?=2E
From:       Calvin Buckley <calvinb () php ! net>
Date:       2020-11-30 18:10:19
Message-ID: php-mail-92ae50ac3c4a7ddcadbbba197f7e97881634322956 () git ! php ! net
[Download RAW message or body]

Commit:    80a1f40281d6d34dcb4a308a1e60fb7c3193efa4
Author:    Calvin Buckley <calvin@cmpct.info>         Wed, 25 Nov 2020 11:08:48 -0500
Parents:   5672e3ea0a83c266529fc45e20d1516ff03994ca
Branches:  master

Link:       http://git.php.net/?p=pecl/database/ibm_db2.git;a=commitdiff;h=80a1f40281d6d34dcb4a308a1e60fb7c3193efa4


Log:
Fix build on PHP 8.0

TSRM macros should be omitted entirely because we won't support
PHP 5 anymore, but it gets it building for now with minimal changes.

The functions still require arginfo to work properly, however.

Changed paths:
  M  ibm_db2.c
  M  php_ibm_db2.h


Diff:
diff --git a/ibm_db2.c b/ibm_db2.c
index 11a567a..9f409c4 100644
--- a/ibm_db2.c
+++ b/ibm_db2.c
@@ -7620,7 +7620,7 @@ PHP_FUNCTION(db2_escape_string)
     /* reallocate to the real length */  
     new_str = (char *)realloc(new_str, new_length + 1);  
 
-    ZEND_RETURN_STRINGL(new_str, new_length, 1)      
+    ZEND_RETURN_STRINGL(new_str, new_length, 1);
 }    
 /* }}} */
 
diff --git a/php_ibm_db2.h b/php_ibm_db2.h
index 1cad9bb..a13c7c7 100644
--- a/php_ibm_db2.h
+++ b/php_ibm_db2.h
@@ -97,6 +97,14 @@ typedef uint32_t uintptr_t;
 #include "TSRM.h"
 #endif
 
+#ifndef TSRMLS_D
+#define TSRMLS_D void
+#define TSRMLS_DC
+#define TSRMLS_C
+#define TSRMLS_CC
+#define TSRMLS_FETCH()
+#endif
+
 /* strlen(" SQLCODE=") added in */
 #define DB2_MAX_ERR_MSG_LEN (SQL_MAX_MESSAGE_LENGTH + SQL_SQLSTATE_SIZE + 10)


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


[prev in list] [next in list] [prev in thread] [next in thread]