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

List:       pecl-cvs
Subject:    [PECL-CVS] [pecl-database-pdo_ibm] ci: Don't have an empty globals on non-i
From:       Calvin Buckley <noreply () php ! net>
Date:       2022-02-11 15:42:28
Message-ID: bJYQOsyTjeJnz5JbtKVMxotUv8RmlNvz3a6X3wAlbec () main ! php ! net
[Download RAW message or body]

Author: Calvin Buckley (NattyNarwhal)
Date: 2022-02-11T11:40:37-04:00

Commit: https://github.com/php/pecl-database-pdo_ibm/commit/c35d420905c7e0c8379a9b68afc8ff78bd143f59
 Raw diff: https://github.com/php/pecl-database-pdo_ibm/commit/c35d420905c7e0c8379a9b68afc8ff78bd143f59.diff


Don't have an empty globals on non-i

MSVC doesn't allow it, so should unbreak Windows builds.

Made to CI branch, but can cherry pick back to main.

Changed paths:
  M  php_pdo_ibm.h


Diff:

diff --git a/php_pdo_ibm.h b/php_pdo_ibm.h
index df1330b..d29cbf0 100644
--- a/php_pdo_ibm.h
+++ b/php_pdo_ibm.h
@@ -47,12 +47,12 @@ PHP_MINFO_FUNCTION(pdo_ibm);
 	Declare any global variables you may need between the BEGIN
 	and END macros here: 
 */
-ZEND_BEGIN_MODULE_GLOBALS(pdo_ibm)
 #ifdef PASE /* i5/OS ease of use turn off/on */
+ZEND_BEGIN_MODULE_GLOBALS(pdo_ibm)
 	long		i5_ignore_userid; 		/* blank userid, possible no qsqsrvr  */
 	long		i5_override_ccsid; 		/* prior any CLI routine override ascii ccsid */
-#endif /* PASE */
 ZEND_END_MODULE_GLOBALS(pdo_ibm)
+#endif /* PASE */
 
 
 /*
@@ -72,6 +72,8 @@ ZEND_END_MODULE_GLOBALS(pdo_ibm)
 #define PDO_IBM_G(v) (pdo_ibm_globals.v)
 #endif
 
+#ifdef PASE /* i5/OS ease of use turn off/on */
 ZEND_EXTERN_MODULE_GLOBALS(pdo_ibm)
+#endif /* PASE */
 
 #endif	/* PHP_PDO_IBM_H */

-- 
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]