Reverted the changes

microsoft · May 15, 2018 · 0b5ceb0 · 0b5ceb0
1 parent 4c7c085
commit 0b5ceb0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/source/shared/core_stmt.cpp b/source/shared/core_stmt.cpp
@@ -1864,11 +1864,7 @@ SQLSMALLINT default_c_type( _Inout_ sqlsrv_stmt* stmt, _In_opt_ SQLULEN paramno,
                  sql_c_type = SQL_C_SBIGINT;
              }
              else {
-#ifdef ZEND_ENABLE_ZVAL_LONG64
-                sql_c_type = SQL_C_SBIGINT;
-#else
                 sql_c_type = SQL_C_SLONG;
-#endif
             }
             break;
         case IS_DOUBLE:
@@ -1938,11 +1934,7 @@ void default_sql_type( _Inout_ sqlsrv_stmt* stmt, _In_opt_ SQLULEN paramno, _In_
                  sql_type = SQL_BIGINT;
              }
              else {
-#ifdef ZEND_ENABLE_ZVAL_LONG64
-                 sql_type = SQL_BIGINT;
-#else
                  sql_type = SQL_INTEGER;
-#endif
             }
             break;
         case IS_DOUBLE:

diff --git a/test/functional/sqlsrv/srv_699_out_param_integer.phpt b/test/functional/sqlsrv/srv_699_out_param_integer.phpt
@@ -66,7 +66,7 @@ if (strtoupper(substr(PHP_OS, 0, 3)) === 'LIN') {
 $sql_callSP = $set_no_count . "{call $procName(?)}";
 
 // Initialize the output parameter to any number
-$outParam = -1; 
+$outParam = 1; 
 $params = array(array(&$outParam, SQLSRV_PARAM_OUT));
 $stmt = sqlsrv_query($conn, $sql_callSP, $params); 
 if (!$stmt) {