From 91c17c8399e48606599d3a23c63a595033c5e717 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Thu, 27 Oct 2011 00:00:35 +0200
Subject: [PATCH] include: Make "long" numeric constants LP64/LLP64 proof
 (sql.h).

---
 include/sql.h | 56 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/include/sql.h b/include/sql.h
index 6b5218ac763..3140fcfb242 100644
--- a/include/sql.h
+++ b/include/sql.h
@@ -45,7 +45,7 @@ extern "C" {
 #define SQL_SUCCEEDED(rc) (((rc)&(~1))==0)
 
 #define SQL_NTS                   (-3)
-#define SQL_NTSL                  (-3L)
+#define SQL_NTSL                  (__MSABI_LONG(-3))
 
 #define SQL_MAX_MESSAGE_LENGTH   512
 
@@ -240,7 +240,7 @@ extern "C" {
 #endif
 
 #if (ODBCVER >= 0x0300)
-#define SQL_NULL_HANDLE     0L
+#define SQL_NULL_HANDLE     __MSABI_LONG(0)
 #endif
 
 #define SQL_SCOPE_CURROW    0
@@ -423,12 +423,12 @@ extern "C" {
 #endif
 
 #if (ODBCVER >= 0x0200)
-#define SQL_AT_ADD_COLUMN                   	0x00000001L
-#define SQL_AT_DROP_COLUMN                  	0x00000002L
+#define SQL_AT_ADD_COLUMN                   __MSABI_LONG(0x00000001)
+#define SQL_AT_DROP_COLUMN                  __MSABI_LONG(0x00000002)
 #endif
 
 #if (ODBCVER >= 0x0300)
-#define SQL_AT_ADD_CONSTRAINT               	0x00000008L
+#define SQL_AT_ADD_CONSTRAINT               __MSABI_LONG(0x00000008)
 
 #endif  /* ODBCVER >= 0x0300 */
 
@@ -443,15 +443,15 @@ extern "C" {
 #define SQL_CB_CLOSE                        1
 #define SQL_CB_PRESERVE                     2
 
-#define SQL_FD_FETCH_NEXT                   0x00000001L
-#define SQL_FD_FETCH_FIRST                  0x00000002L
-#define SQL_FD_FETCH_LAST                   0x00000004L
-#define SQL_FD_FETCH_PRIOR                  0x00000008L
-#define SQL_FD_FETCH_ABSOLUTE               0x00000010L
-#define SQL_FD_FETCH_RELATIVE               0x00000020L
+#define SQL_FD_FETCH_NEXT                   __MSABI_LONG(0x00000001)
+#define SQL_FD_FETCH_FIRST                  __MSABI_LONG(0x00000002)
+#define SQL_FD_FETCH_LAST                   __MSABI_LONG(0x00000004)
+#define SQL_FD_FETCH_PRIOR                  __MSABI_LONG(0x00000008)
+#define SQL_FD_FETCH_ABSOLUTE               __MSABI_LONG(0x00000010)
+#define SQL_FD_FETCH_RELATIVE               __MSABI_LONG(0x00000020)
 
-#define SQL_GD_ANY_COLUMN                   0x00000001L
-#define SQL_GD_ANY_ORDER                    0x00000002L
+#define SQL_GD_ANY_COLUMN                   __MSABI_LONG(0x00000001)
+#define SQL_GD_ANY_ORDER                    __MSABI_LONG(0x00000002)
 
 #define SQL_IC_UPPER                        1
 #define SQL_IC_LOWER                        2
@@ -459,19 +459,19 @@ extern "C" {
 #define SQL_IC_MIXED                        4
 
 #if (ODBCVER >= 0x0201)
-#define SQL_OJ_LEFT                         0x00000001L
-#define SQL_OJ_RIGHT                        0x00000002L
-#define SQL_OJ_FULL                         0x00000004L
-#define SQL_OJ_NESTED                       0x00000008L
-#define SQL_OJ_NOT_ORDERED                  0x00000010L
-#define SQL_OJ_INNER                        0x00000020L
-#define SQL_OJ_ALL_COMPARISON_OPS           0x00000040L
+#define SQL_OJ_LEFT                         __MSABI_LONG(0x00000001)
+#define SQL_OJ_RIGHT                        __MSABI_LONG(0x00000002)
+#define SQL_OJ_FULL                         __MSABI_LONG(0x00000004)
+#define SQL_OJ_NESTED                       __MSABI_LONG(0x00000008)
+#define SQL_OJ_NOT_ORDERED                  __MSABI_LONG(0x00000010)
+#define SQL_OJ_INNER                        __MSABI_LONG(0x00000020)
+#define SQL_OJ_ALL_COMPARISON_OPS           __MSABI_LONG(0x00000040)
 #endif
 
-#define SQL_SCCO_READ_ONLY                  0x00000001L
-#define SQL_SCCO_LOCK                       0x00000002L
-#define SQL_SCCO_OPT_ROWVER                 0x00000004L
-#define SQL_SCCO_OPT_VALUES                 0x00000008L
+#define SQL_SCCO_READ_ONLY                  __MSABI_LONG(0x00000001)
+#define SQL_SCCO_LOCK                       __MSABI_LONG(0x00000002)
+#define SQL_SCCO_OPT_ROWVER                 __MSABI_LONG(0x00000004)
+#define SQL_SCCO_OPT_VALUES                 __MSABI_LONG(0x00000008)
 
 #define SQL_TC_NONE                         0
 #define SQL_TC_DML                          1
@@ -479,13 +479,13 @@ extern "C" {
 #define SQL_TC_DDL_COMMIT                   3
 #define SQL_TC_DDL_IGNORE                   4
 
-#define SQL_TXN_READ_UNCOMMITTED            0x00000001L
+#define SQL_TXN_READ_UNCOMMITTED            __MSABI_LONG(0x00000001)
 #define SQL_TRANSACTION_READ_UNCOMMITTED	SQL_TXN_READ_UNCOMMITTED
-#define SQL_TXN_READ_COMMITTED              0x00000002L
+#define SQL_TXN_READ_COMMITTED              __MSABI_LONG(0x00000002)
 #define SQL_TRANSACTION_READ_COMMITTED		SQL_TXN_READ_COMMITTED
-#define SQL_TXN_REPEATABLE_READ             0x00000004L
+#define SQL_TXN_REPEATABLE_READ             __MSABI_LONG(0x00000004)
 #define SQL_TRANSACTION_REPEATABLE_READ		SQL_TXN_REPEATABLE_READ
-#define SQL_TXN_SERIALIZABLE                0x00000008L
+#define SQL_TXN_SERIALIZABLE                __MSABI_LONG(0x00000008)
 #define SQL_TRANSACTION_SERIALIZABLE		SQL_TXN_SERIALIZABLE
 
 #define SQL_NC_HIGH                         0
-- 
2.11.4.GIT