Skip to content

Commit c35d420

Browse files
committed
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.
1 parent 688d198 commit c35d420

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

php_pdo_ibm.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,12 @@ PHP_MINFO_FUNCTION(pdo_ibm);
4747
Declare any global variables you may need between the BEGIN
4848
and END macros here:
4949
*/
50-
ZEND_BEGIN_MODULE_GLOBALS(pdo_ibm)
5150
#ifdef PASE /* i5/OS ease of use turn off/on */
51+
ZEND_BEGIN_MODULE_GLOBALS(pdo_ibm)
5252
long i5_ignore_userid; /* blank userid, possible no qsqsrvr */
5353
long i5_override_ccsid; /* prior any CLI routine override ascii ccsid */
54-
#endif /* PASE */
5554
ZEND_END_MODULE_GLOBALS(pdo_ibm)
55+
#endif /* PASE */
5656

5757

5858
/*
@@ -72,6 +72,8 @@ ZEND_END_MODULE_GLOBALS(pdo_ibm)
7272
#define PDO_IBM_G(v) (pdo_ibm_globals.v)
7373
#endif
7474

75+
#ifdef PASE /* i5/OS ease of use turn off/on */
7576
ZEND_EXTERN_MODULE_GLOBALS(pdo_ibm)
77+
#endif /* PASE */
7678

7779
#endif /* PHP_PDO_IBM_H */

0 commit comments

Comments
 (0)