From 1c598cf6a8086afd42171b1771dac94d53debd13 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Wed, 20 May 2020 15:40:57 +0200
Subject: [PATCH] Fix [-Wundef] warning in PDO DBLib extension

---
 ext/pdo_dblib/dblib_driver.c      |  6 +++---
 ext/pdo_dblib/dblib_stmt.c        |  2 +-
 ext/pdo_dblib/pdo_dblib.c         | 10 +++++-----
 ext/pdo_dblib/php_pdo_dblib.h     |  2 +-
 ext/pdo_dblib/php_pdo_dblib_int.h |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
index 85473c2ac1..7f160a402f 100644
--- a/ext/pdo_dblib/dblib_driver.c
+++ b/ext/pdo_dblib/dblib_driver.c
@@ -539,7 +539,7 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
 		}
 	}
 
-#if !PHP_DBLIB_IS_MSSQL
+#ifndef PHP_DBLIB_IS_MSSQL
 	if (vars[0].optval) {
 		DBSETLCHARSET(H->login, vars[0].optval);
 	}
@@ -570,7 +570,7 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
 	}
 #endif
 
-#if PHP_DBLIB_IS_MSSQL
+#ifdef PHP_DBLIB_IS_MSSQL
 	/* dblib do not return more than this length from text/image */
 	DBSETOPT(H->link, DBTEXTLIMIT, "2147483647");
 #endif
@@ -607,7 +607,7 @@ cleanup:
 }
 
 const pdo_driver_t pdo_dblib_driver = {
-#if PDO_DBLIB_IS_MSSQL
+#ifdef PDO_DBLIB_IS_MSSQL
 	PDO_DRIVER_HEADER(mssql),
 #elif defined(PHP_WIN32)
 #define PDO_DBLIB_IS_SYBASE
diff --git a/ext/pdo_dblib/dblib_stmt.c b/ext/pdo_dblib/dblib_stmt.c
index d8608c1d46..94526a4c6e 100644
--- a/ext/pdo_dblib/dblib_stmt.c
+++ b/ext/pdo_dblib/dblib_stmt.c
@@ -373,7 +373,7 @@ static int pdo_dblib_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr,
 				case SQLCHAR:
 				case SQLVARCHAR:
 				case SQLTEXT: {
-#if ilia_0
+#ifdef ilia_0
 					while (data_len>0 && data[data_len-1] == ' ') { /* nuke trailing whitespace */
 						data_len--;
 					}
diff --git a/ext/pdo_dblib/pdo_dblib.c b/ext/pdo_dblib/pdo_dblib.c
index d5670cc86f..b36175b9ca 100644
--- a/ext/pdo_dblib/pdo_dblib.c
+++ b/ext/pdo_dblib/pdo_dblib.c
@@ -40,14 +40,14 @@ static const zend_module_dep pdo_dblib_deps[] = {
 	ZEND_MOD_END
 };
 
-#if PDO_DBLIB_IS_MSSQL
+#ifdef PDO_DBLIB_IS_MSSQL
 zend_module_entry pdo_mssql_module_entry = {
 #else
 zend_module_entry pdo_dblib_module_entry = {
 #endif
 	STANDARD_MODULE_HEADER_EX, NULL,
 	pdo_dblib_deps,
-#if PDO_DBLIB_IS_MSSQL
+#ifdef PDO_DBLIB_IS_MSSQL
 	"pdo_mssql",
 #elif defined(PHP_WIN32)
 	"pdo_sybase",
@@ -72,7 +72,7 @@ zend_module_entry pdo_dblib_module_entry = {
 #ifdef ZTS
 ZEND_TSRMLS_CACHE_DEFINE()
 #endif
-#if PDO_DBLIB_IS_MSSQL
+#ifdef PDO_DBLIB_IS_MSSQL
 ZEND_GET_MODULE(pdo_mssql)
 #else
 ZEND_GET_MODULE(pdo_dblib)
@@ -209,7 +209,7 @@ PHP_MINIT_FUNCTION(pdo_dblib)
 		return FAILURE;
 	}
 
-#if !PHP_DBLIB_IS_MSSQL
+#ifndef PHP_DBLIB_IS_MSSQL
 	dberrhandle((EHANDLEFUNC) pdo_dblib_error_handler);
 	dbmsghandle((MHANDLEFUNC) pdo_dblib_msg_handler);
 #endif
@@ -228,7 +228,7 @@ PHP_MINFO_FUNCTION(pdo_dblib)
 {
 	php_info_print_table_start();
 	php_info_print_table_header(2, "PDO Driver for "
-#if PDO_DBLIB_IS_MSSQL
+#ifdef PDO_DBLIB_IS_MSSQL
 		"MSSQL"
 #elif defined(PHP_WIN32)
 		"FreeTDS/Sybase/MSSQL"
diff --git a/ext/pdo_dblib/php_pdo_dblib.h b/ext/pdo_dblib/php_pdo_dblib.h
index af4e845624..0fe9a42298 100644
--- a/ext/pdo_dblib/php_pdo_dblib.h
+++ b/ext/pdo_dblib/php_pdo_dblib.h
@@ -18,7 +18,7 @@
 #ifndef PHP_PDO_DBLIB_H
 #define PHP_PDO_DBLIB_H
 
-#if PDO_DBLIB_IS_MSSQL
+#ifdef PDO_DBLIB_IS_MSSQL
 extern zend_module_entry pdo_mssql_module_entry;
 #define phpext_pdo_mssql_ptr &pdo_mssql_module_entry
 #else
diff --git a/ext/pdo_dblib/php_pdo_dblib_int.h b/ext/pdo_dblib/php_pdo_dblib_int.h
index ed82ada40e..ecd65f577c 100644
--- a/ext/pdo_dblib/php_pdo_dblib_int.h
+++ b/ext/pdo_dblib/php_pdo_dblib_int.h
@@ -22,7 +22,7 @@
 # define PDO_DBLIB_FLAVOUR "Generic DB-lib"
 #endif
 
-#if PHP_DBLIB_IS_MSSQL
+#ifdef PHP_DBLIB_IS_MSSQL
 # include <sqlfront.h>
 # include <sqldb.h>
 
-- 
2.40.0