From 81ff0851eaf3b06df881a2bbd5655a243cc8019e Mon Sep 17 00:00:00 2001
From: Jenny Tam <v-yitam@microsoft.com>
Date: Thu, 21 Jun 2018 14:29:09 -0700
Subject: [PATCH] Removed win32 ifdefs re connection resiliency (#802)

---
 source/pdo_sqlsrv/pdo_dbh.cpp | 6 ------
 source/shared/core_sqlsrv.h   | 4 ----
 source/sqlsrv/conn.cpp        | 6 ------
 3 files changed, 16 deletions(-)

diff --git a/source/pdo_sqlsrv/pdo_dbh.cpp b/source/pdo_sqlsrv/pdo_dbh.cpp
index 60d03eeb..8154ac69 100644
--- a/source/pdo_sqlsrv/pdo_dbh.cpp
+++ b/source/pdo_sqlsrv/pdo_dbh.cpp
@@ -43,10 +43,8 @@ const char AttachDBFileName[] = "AttachDbFileName";
 const char Authentication[] = "Authentication";
 const char ColumnEncryption[] = "ColumnEncryption";
 const char ConnectionPooling[] = "ConnectionPooling";
-#ifdef _WIN32
 const char ConnectRetryCount[] = "ConnectRetryCount";
 const char ConnectRetryInterval[] = "ConnectRetryInterval";
-#endif // _WIN32
 const char Database[] = "Database";
 const char Driver[] = "Driver";
 const char Encrypt[] = "Encrypt";
@@ -109,7 +107,6 @@ struct pdo_txn_isolation_conn_attr_func
     static void func( connection_option const* /*option*/, _In_ zval* value_z, _Inout_ sqlsrv_conn* conn, std::string& /*conn_str*/ TSRMLS_DC );
 };
 
-#ifdef _WIN32
 struct pdo_int_conn_str_func {
 
     static void func( _In_ connection_option const* option, _In_ zval* value, sqlsrv_conn* /*conn*/, _Out_ std::string& conn_str TSRMLS_DC )
@@ -125,7 +122,6 @@ struct pdo_int_conn_str_func {
         conn_str += "};";
     }
 };
-#endif // _WIN32
 
 template <unsigned int Attr>
 struct pdo_int_conn_attr_func {
@@ -243,7 +239,6 @@ const connection_option PDO_CONN_OPTS[] = {
         CONN_ATTR_STRING,
         column_encryption_set_func::func
     },
-#ifdef _WIN32
     {
         PDOConnOptionNames::ConnectRetryCount,
         sizeof( PDOConnOptionNames::ConnectRetryCount ),
@@ -262,7 +257,6 @@ const connection_option PDO_CONN_OPTS[] = {
         CONN_ATTR_INT,
         pdo_int_conn_str_func::func
     },
-#endif // _WIN32
     {
         PDOConnOptionNames::Database,
         sizeof( PDOConnOptionNames::Database ),
diff --git a/source/shared/core_sqlsrv.h b/source/shared/core_sqlsrv.h
index 39e53b19..8ef19e97 100644
--- a/source/shared/core_sqlsrv.h
+++ b/source/shared/core_sqlsrv.h
@@ -1112,10 +1112,8 @@ const char Driver[] = "Driver";
 const char CharacterSet[] = "CharacterSet";
 const char ConnectionPooling[] = "ConnectionPooling";
 const char ColumnEncryption[] = "ColumnEncryption";
-#ifdef _WIN32
 const char ConnectRetryCount[] = "ConnectRetryCount";
 const char ConnectRetryInterval[] = "ConnectRetryInterval";
-#endif // _WIN32
 const char Database[] = "Database";
 const char Encrypt[] = "Encrypt";
 const char Failover_Partner[] = "Failover_Partner";
@@ -1168,10 +1166,8 @@ enum SQLSRV_CONN_OPTIONS {
     SQLSRV_CONN_OPTION_KEYSTORE_PRINCIPAL_ID,
     SQLSRV_CONN_OPTION_KEYSTORE_SECRET,
     SQLSRV_CONN_OPTION_TRANSPARENT_NETWORK_IP_RESOLUTION,
-#ifdef _WIN32
     SQLSRV_CONN_OPTION_CONN_RETRY_COUNT,
     SQLSRV_CONN_OPTION_CONN_RETRY_INTERVAL,
-#endif // _WIN32
 
    // Driver specific connection options
    SQLSRV_CONN_OPTION_DRIVER_SPECIFIC = 1000,
diff --git a/source/sqlsrv/conn.cpp b/source/sqlsrv/conn.cpp
index 183ac3c5..c77a70de 100644
--- a/source/sqlsrv/conn.cpp
+++ b/source/sqlsrv/conn.cpp
@@ -95,7 +95,6 @@ struct bool_conn_str_func {
     }
 };
 
-#ifdef _WIN32
 struct int_conn_str_func {
 
     static void func( _In_ connection_option const* option, _In_ zval* value, sqlsrv_conn* /*conn*/, _Out_ std::string& conn_str TSRMLS_DC )
@@ -111,7 +110,6 @@ struct int_conn_str_func {
         conn_str += "};";
     }
 };
-#endif // _WIN32
 
 template <unsigned int Attr>
 struct int_conn_attr_func {
@@ -188,10 +186,8 @@ const char Authentication[] = "Authentication";
 const char CharacterSet[] = "CharacterSet";
 const char ColumnEncryption[] = "ColumnEncryption";
 const char ConnectionPooling[] = "ConnectionPooling";
-#ifdef _WIN32
 const char ConnectRetryCount[] = "ConnectRetryCount";
 const char ConnectRetryInterval[] = "ConnectRetryInterval";
-#endif // _WIN32
 const char Database[] = "Database";
 const char DateAsString[] = "ReturnDatesAsStrings";
 const char Driver[] = "Driver";
@@ -324,7 +320,6 @@ const connection_option SS_CONN_OPTS[] = {
         CONN_ATTR_STRING,
         column_encryption_set_func::func
     },
-#ifdef _WIN32
     {
         SSConnOptionNames::ConnectRetryCount,
         sizeof( SSConnOptionNames::ConnectRetryCount ),
@@ -343,7 +338,6 @@ const connection_option SS_CONN_OPTS[] = {
         CONN_ATTR_INT,
         int_conn_str_func::func
     },
-#endif // _WIN32
     {
         SSConnOptionNames::Database,
         sizeof( SSConnOptionNames::Database ),