]> granicus.if.org Git - postgresql/commitdiff
Include file alignment fixes.
authorBruce Momjian <bruce@momjian.us>
Sun, 11 Feb 2001 13:53:42 +0000 (13:53 +0000)
committerBruce Momjian <bruce@momjian.us>
Sun, 11 Feb 2001 13:53:42 +0000 (13:53 +0000)
12 files changed:
src/interfaces/odbc/columninfo.h
src/interfaces/odbc/connection.h
src/interfaces/odbc/dlg_specific.h
src/interfaces/odbc/gpps.h
src/interfaces/odbc/iodbc.h
src/interfaces/odbc/isql.h
src/interfaces/odbc/isqlext.h
src/interfaces/odbc/misc.h
src/interfaces/odbc/pgtypes.h
src/interfaces/odbc/psqlodbc.h
src/interfaces/odbc/socket.h
src/interfaces/odbc/statement.h

index da1dbfe0f6cc78b63864ce05675aee535285ebff..964ebc7617b905718efb885ed294772a90be4c0c 100644 (file)
@@ -36,9 +36,9 @@ char          CI_read_fields(ColumnInfoClass *self, ConnectionClass *conn);
 
 /* functions for setting up the fields from within the program, */
 /* without reading from a socket */
-void CI_set_num_fields(ColumnInfoClass *self, int new_num_fields);
+void           CI_set_num_fields(ColumnInfoClass *self, int new_num_fields);
 void CI_set_field_info(ColumnInfoClass *self, int field_num, char *new_name,
-                 Oid new_adtid, Int2 new_adtsize, Int4 atttypmod);
+                                 Oid new_adtid, Int2 new_adtsize, Int4 atttypmod);
 
 
 #endif
index efc7eaeaeadbb05df9434d7fb96824baab1f1e5d..75df0ed9f870d49a6169b6b30a8c9b864e5fdb48 100644 (file)
@@ -93,11 +93,11 @@ typedef enum
 #define AUTH_REQ_CRYPT         4
 
 /*     Startup Packet sizes */
-#define SM_DATABASE            64
-#define SM_USER                        32
-#define SM_OPTIONS             64
-#define SM_UNUSED              64
-#define SM_TTY                 64
+#define SM_DATABASE                    64
+#define SM_USER                                32
+#define SM_OPTIONS                     64
+#define SM_UNUSED                      64
+#define SM_TTY                         64
 
 /*     Old 6.2 protocol defines */
 #define NO_AUTHENTICATION      7
@@ -200,26 +200,26 @@ struct col_info
 #endif
 
 typedef BOOL (FAR WINAPI * DataSourceToDriverProc) (UDWORD,
-                                                                                                       SWORD,
-                                                                                                       PTR,
-                                                                                                       SDWORD,
-                                                                                                       PTR,
-                                                                                                       SDWORD,
-                                                                                                       SDWORD FAR *,
-                                                                                                       UCHAR FAR *,
-                                                                                                       SWORD,
-                                                                                                       SWORD FAR *);
+                                                                                                                               SWORD,
+                                                                                                                               PTR,
+                                                                                                                               SDWORD,
+                                                                                                                               PTR,
+                                                                                                                               SDWORD,
+                                                                                                                       SDWORD FAR *,
+                                                                                                                        UCHAR FAR *,
+                                                                                                                               SWORD,
+                                                                                                                       SWORD FAR *);
 
 typedef BOOL (FAR WINAPI * DriverToDataSourceProc) (UDWORD,
-                                                                                                       SWORD,
-                                                                                                       PTR,
-                                                                                                       SDWORD,
-                                                                                                       PTR,
-                                                                                                       SDWORD,
-                                                                                                       SDWORD FAR *,
-                                                                                                       UCHAR FAR *,
-                                                                                                       SWORD,
-                                                                                                       SWORD FAR *);
+                                                                                                                               SWORD,
+                                                                                                                               PTR,
+                                                                                                                               SDWORD,
+                                                                                                                               PTR,
+                                                                                                                               SDWORD,
+                                                                                                                       SDWORD FAR *,
+                                                                                                                        UCHAR FAR *,
+                                                                                                                               SWORD,
+                                                                                                                       SWORD FAR *);
 
 /*******       The Connection handle   ************/
 struct ConnectionClass_
@@ -255,12 +255,12 @@ struct ConnectionClass_
 
 
 /* Accessor functions */
-#define CC_get_socket(x)       (x->sock)
-#define CC_get_database(x)     (x->connInfo.database)
-#define CC_get_server(x)       (x->connInfo.server)
-#define CC_get_DSN(x)          (x->connInfo.dsn)
-#define CC_get_username(x)     (x->connInfo.username)
-#define CC_is_onlyread(x)      (x->connInfo.onlyread[0] == '1')
+#define CC_get_socket(x)               (x->sock)
+#define CC_get_database(x)             (x->connInfo.database)
+#define CC_get_server(x)               (x->connInfo.server)
+#define CC_get_DSN(x)                  (x->connInfo.dsn)
+#define CC_get_username(x)             (x->connInfo.username)
+#define CC_is_onlyread(x)              (x->connInfo.onlyread[0] == '1')
 
 
 /*     for CC_DSN_info */
index 0f653c559bc690ba0b6cd291444b96a51ed93aba..3d493089540728883b4d0fb4479436c81cab6285 100644 (file)
 
 /* INI File Stuff */
 #ifndef WIN32
-#define ODBC_INI               ".odbc.ini"
+#define ODBC_INI                       ".odbc.ini"
 #ifdef ODBCINSTDIR
-#define ODBCINST_INI   ODBCINSTDIR "/odbcinst.ini"
+#define ODBCINST_INI           ODBCINSTDIR "/odbcinst.ini"
 #else
-#define ODBCINST_INI   "/etc/odbcinst.ini"
+#define ODBCINST_INI           "/etc/odbcinst.ini"
 #warning "location of odbcinst.ini file defaulted to /etc"
 #endif
 #else                                                  /* WIN32 */
-#define ODBC_INI               "ODBC.INI"              /* ODBC initialization file */
-#define ODBCINST_INI   "ODBCINST.INI"  /* ODBC Installation file */
+#define ODBC_INI                       "ODBC.INI"      /* ODBC initialization file */
+#define ODBCINST_INI           "ODBCINST.INI"          /* ODBC Installation file */
 #endif  /* WIN32 */
 
 
-#define INI_DSN                          DBMS_NAME             /* Name of default Datasource in
+#define INI_DSN                                DBMS_NAME       /* Name of default Datasource in
                                                                                 * ini file (not used?) */
-#define INI_KDESC                "Description" /* Data source description */
-#define INI_SERVER               "Servername"  /* Name of Server running the
-                                                                                * Postgres service */
-#define INI_PORT                 "Port"/* Port on which the Postmaster is
-                                                                * listening */
-#define INI_DATABASE     "Database"    /* Database Name */
-#define INI_USER                 "Username"    /* Default User Name */
-#define INI_PASSWORD     "Password"    /* Default Password */
-#define INI_DEBUG                "Debug"               /* Debug flag */
-#define INI_FETCH                "Fetch"               /* Fetch Max Count */
-#define INI_SOCKET               "Socket"              /* Socket buffer size */
-#define INI_READONLY     "ReadOnly"    /* Database is read only */
-#define INI_COMMLOG              "CommLog"             /* Communication to backend
+#define INI_KDESC                      "Description"           /* Data source description */
+#define INI_SERVER                     "Servername"            /* Name of Server running
+                                                                                                * the Postgres service */
+#define INI_PORT                       "Port"          /* Port on which the Postmaster is
+                                                                                * listening */
+#define INI_DATABASE           "Database"      /* Database Name */
+#define INI_USER                       "Username"      /* Default User Name */
+#define INI_PASSWORD           "Password"      /* Default Password */
+#define INI_DEBUG                      "Debug"         /* Debug flag */
+#define INI_FETCH                      "Fetch"         /* Fetch Max Count */
+#define INI_SOCKET                     "Socket"        /* Socket buffer size */
+#define INI_READONLY           "ReadOnly"      /* Database is read only */
+#define INI_COMMLOG                    "CommLog"       /* Communication to backend
                                                                                 * logging */
-#define INI_PROTOCOL     "Protocol"    /* What protocol (6.2) */
-#define INI_OPTIMIZER    "Optimizer"   /* Use backend genetic optimizer */
-#define INI_KSQO                 "Ksqo"/* Keyset query optimization */
-#define INI_CONNSETTINGS  "ConnSettings"               /* Anything to send to
+#define INI_PROTOCOL           "Protocol"      /* What protocol (6.2) */
+#define INI_OPTIMIZER          "Optimizer" /* Use backend genetic optimizer */
+#define INI_KSQO                       "Ksqo"          /* Keyset query optimization */
+#define INI_CONNSETTINGS       "ConnSettings"          /* Anything to send to
                                                                                                 * backend on successful
                                                                                                 * connection */
-#define INI_UNIQUEINDEX   "UniqueIndex" /* Recognize unique indexes */
-#define INI_UNKNOWNSIZES  "UnknownSizes"               /* How to handle unknown
+#define INI_UNIQUEINDEX                "UniqueIndex"           /* Recognize unique
+                                                                                                * indexes */
+#define INI_UNKNOWNSIZES       "UnknownSizes"          /* How to handle unknown
                                                                                                 * result set sizes */
 
-#define INI_CANCELASFREESTMT  "CancelAsFreeStmt"
+#define INI_CANCELASFREESTMT   "CancelAsFreeStmt"
 
 #define INI_USEDECLAREFETCH "UseDeclareFetch"  /* Use Declare/Fetch
                                                                                                 * cursors */
@@ -90,9 +91,9 @@
 #define INI_PARSE                                      "Parse"
 #define INI_EXTRASYSTABLEPREFIXES      "ExtraSysTablePrefixes"
 
-#define INI_TRANSLATIONNAME              "TranslationName"
-#define INI_TRANSLATIONDLL               "TranslationDLL"
-#define INI_TRANSLATIONOPTION    "TranslationOption"
+#define INI_TRANSLATIONNAME                    "TranslationName"
+#define INI_TRANSLATIONDLL                     "TranslationDLL"
+#define INI_TRANSLATIONOPTION          "TranslationOption"
 
 
 /*     Connection Defaults */
index 5059866e721778f75ebabad6d5e78ce159d3c969..c6d1d38ec2387804ebf48cec16825bbb0f924b01 100644 (file)
@@ -17,22 +17,22 @@ extern              "C"
 {
 #endif
 
-DWORD          GetPrivateProfileString(char *theSection,               /* section name */
-                                                                       char *theKey,           /* search key name */
-                                                                       char *theDefault,       /* default value if not
-                                                                                                                * found */
-                                                                       char *theReturnBuffer,          /* return valuse stored
-                                                                                                                                * here */
-                                                                 size_t theBufferLength,               /* byte length of return
-                                                                                                                                * buffer */
-                                                                       char *theIniFileName);          /* pathname of ini file
-                                                                                                                                * to search */
-
-DWORD          WritePrivateProfileString(char *theSection,             /* section name */
-                                                                 char *theKey,         /* write key name */
-                                                                 char *theBuffer,      /* input buffer */
-                                                                 char *theIniFileName);                /* pathname of ini file
-                                                                                                                                * to write */
+       DWORD           GetPrivateProfileString(char *theSection,               /* section name */
+                                                                                                       char *theKey,           /* search key name */
+                                                                                                       char *theDefault,       /* default value if not
+                                                                                                                                                * found */
+                                                                                                       char *theReturnBuffer,          /* return valuse stored
+                                                                                                                                                                * here */
+                                                                                                 size_t theBufferLength,               /* byte length of return
+                                                                                                                                                                * buffer */
+                                                                                                       char *theIniFileName);          /* pathname of ini file
+                                                                                                                                                                * to search */
+
+       DWORD           WritePrivateProfileString(char *theSection,             /* section name */
+                                                                                                         char *theKey,         /* write key name */
+                                                                                                         char *theBuffer,      /* input buffer */
+                                                                                                  char *theIniFileName);               /* pathname of ini file
+                                                                                                                                                                * to write */
 
 #ifdef __cplusplus
 }
index 3dccf89a66af0c058a98b783410c3874166c2885..c8bc7bfd4b38096d7806a9a41bc9dca6cf015260 100644 (file)
@@ -57,10 +57,10 @@ typedef int BOOL;
 
 #endif  /* WIN32 */
 
-#define  SYSERR    (-1)
+#define  SYSERR                (-1)
 
 #ifndef  NULL
-#define  NULL           ((void FAR*)0UL)
+#define  NULL          ((void FAR*)0UL)
 #endif
 
 #endif
index 72b58a3d3f4f7dda2f9fa8a2b77028ecece1d50a..adf8bd922e8a9738e1217ad04c60226ef4a2e39f 100644 (file)
@@ -19,45 +19,45 @@ typedef void FAR *HSTMT;
 typedef signed short RETCODE;
 
 #ifdef WIN32
-#define SQL_API                         __stdcall
+#define SQL_API                                __stdcall
 #else
-#define SQL_API                         EXPORT CALLBACK
+#define SQL_API                                EXPORT CALLBACK
 #endif
 
-#define ODBCVER                                0x0250
+#define ODBCVER                                0x0250
 
 #define SQL_MAX_MESSAGE_LENGTH 512
 #define SQL_MAX_DSN_LENGTH     32
 
 /* return code */
-#define SQL_INVALID_HANDLE     (-2)
-#define SQL_ERROR                      (-1)
+#define SQL_INVALID_HANDLE     (-2)
+#define SQL_ERROR                      (-1)
 #define SQL_SUCCESS                    0
 #define SQL_SUCCESS_WITH_INFO     1
 #define SQL_NO_DATA_FOUND      100
 
 /* standard SQL datatypes (agree with ANSI type numbering) */
-#define SQL_CHAR                   1
-#define SQL_NUMERIC                2
-#define SQL_DECIMAL                3
-#define SQL_INTEGER                4
-#define SQL_SMALLINT       5
-#define SQL_FLOAT                  6
-#define SQL_REAL                   7
-#define SQL_DOUBLE                 8
-#define SQL_VARCHAR                12
-
-#define SQL_TYPE_MIN       SQL_CHAR
-#define SQL_TYPE_NUL       0
-#define SQL_TYPE_MAX       SQL_VARCHAR
+#define SQL_CHAR                       1
+#define SQL_NUMERIC                    2
+#define SQL_DECIMAL                    3
+#define SQL_INTEGER                    4
+#define SQL_SMALLINT           5
+#define SQL_FLOAT                      6
+#define SQL_REAL                       7
+#define SQL_DOUBLE                     8
+#define SQL_VARCHAR                    12
+
+#define SQL_TYPE_MIN           SQL_CHAR
+#define SQL_TYPE_NUL           0
+#define SQL_TYPE_MAX           SQL_VARCHAR
 
 /* C to SQL datatype mapping */
-#define SQL_C_CHAR                 SQL_CHAR
-#define SQL_C_LONG                 SQL_INTEGER
-#define SQL_C_SHORT                SQL_SMALLINT
-#define SQL_C_FLOAT                SQL_REAL
-#define SQL_C_DOUBLE       SQL_DOUBLE
-#define SQL_C_DEFAULT      99
+#define SQL_C_CHAR                     SQL_CHAR
+#define SQL_C_LONG                     SQL_INTEGER
+#define SQL_C_SHORT                    SQL_SMALLINT
+#define SQL_C_FLOAT                    SQL_REAL
+#define SQL_C_DOUBLE           SQL_DOUBLE
+#define SQL_C_DEFAULT          99
 
 #define SQL_NO_NULLS           0
 #define SQL_NULLABLE           1
@@ -69,18 +69,18 @@ typedef signed short RETCODE;
 #define SQL_NTS                                (-3)
 
 /* SQLFreeStmt flag values */
-#define SQL_CLOSE                      0
-#define SQL_DROP                       1
-#define SQL_UNBIND                     2
-#define SQL_RESET_PARAMS       3
+#define SQL_CLOSE                      0
+#define SQL_DROP                       1
+#define SQL_UNBIND                     2
+#define SQL_RESET_PARAMS       3
 
 /* SQLTransact flag values */
-#define SQL_COMMIT                     0
-#define SQL_ROLLBACK           1
+#define SQL_COMMIT                     0
+#define SQL_ROLLBACK           1
 
 /* SQLColAttributes flag values */
-#define SQL_COLUMN_COUNT       0
-#define SQL_COLUMN_LABEL       18
+#define SQL_COLUMN_COUNT       0
+#define SQL_COLUMN_LABEL       18
 #define SQL_COLATT_OPT_MAX     SQL_COLUMN_LABEL
 #define SQL_COLUMN_DRIVER_START    1000
 
@@ -95,16 +95,16 @@ typedef signed short RETCODE;
 typedef unsigned char BYTE;
 
 /* More SQLColAttributes flag values */
-#define SQL_COLUMN_NAME                        1
-#define SQL_COLUMN_TYPE                        2
-#define SQL_COLUMN_LENGTH              3
-#define SQL_COLUMN_PRECISION   4
-#define SQL_COLUMN_SCALE               5
-#define SQL_COLUMN_DISPLAY_SIZE 6
-#define SQL_COLUMN_NULLABLE            7
-#define SQL_COLUMN_UNSIGNED            8
-#define SQL_COLUMN_MONEY               9
-#define SQL_COLUMN_UPDATABLE   10
+#define SQL_COLUMN_NAME                                1
+#define SQL_COLUMN_TYPE                                2
+#define SQL_COLUMN_LENGTH                      3
+#define SQL_COLUMN_PRECISION           4
+#define SQL_COLUMN_SCALE                       5
+#define SQL_COLUMN_DISPLAY_SIZE                6
+#define SQL_COLUMN_NULLABLE                    7
+#define SQL_COLUMN_UNSIGNED                    8
+#define SQL_COLUMN_MONEY                       9
+#define SQL_COLUMN_UPDATABLE           10
 #define SQL_COLUMN_AUTO_INCREMENT      11
 #define SQL_COLUMN_CASE_SENSITIVE      12
 #define SQL_COLUMN_SEARCHABLE          13
@@ -114,15 +114,15 @@ typedef unsigned char BYTE;
 #define SQL_COLUMN_QUALIFIER_NAME      17
 
 /* SQLColAttributes Searchable flags */
-#define SQL_UNSEARCHABLE               0
-#define SQL_LIKE_ONLY                  1
-#define SQL_ALL_EXCEPT_LIKE    2
-#define SQL_SEARCHABLE                 3
-#define SQL_PRED_SEARCHABLE    SQL_SEARCHABLE
+#define SQL_UNSEARCHABLE                       0
+#define SQL_LIKE_ONLY                          1
+#define SQL_ALL_EXCEPT_LIKE                    2
+#define SQL_SEARCHABLE                         3
+#define SQL_PRED_SEARCHABLE                    SQL_SEARCHABLE
 
 /* SQLColAttributes Updateable flags */
-#define SQL_ATTR_READONLY              0
-#define SQL_ATTR_WRITE                 1
+#define SQL_ATTR_READONLY                      0
+#define SQL_ATTR_WRITE                         1
 #define SQL_ATTR_READWRITE_UNKNOWN     2
 
 /*
@@ -133,11 +133,9 @@ extern             "C"
 {
 #endif
 
-       RETCODE SQL_API SQLAllocConnect(HENV henv,
-                                                                                               HDBC FAR *phdbc);
+       RETCODE SQL_API SQLAllocConnect(HENV henv, HDBC FAR *phdbc);
        RETCODE SQL_API SQLAllocEnv(HENV FAR *phenv);
-       RETCODE SQL_API SQLAllocStmt(HDBC hdbc,
-                                                                                        HSTMT FAR *phstmt);
+       RETCODE SQL_API SQLAllocStmt(HDBC hdbc, HSTMT FAR *phstmt);
        RETCODE SQL_API SQLBindCol(HSTMT hstmt,
                                                                                   UWORD icol,
                                                                                   SWORD fCType,
@@ -217,7 +215,8 @@ extern              "C"
        RETCODE SQL_API SQLTransact(HENV henv, HDBC hdbc,
                                                                                        UWORD fType);
 
-       RETCODE SQL_API SQLSetParam(HSTMT hstmt, UWORD ipar,
+       RETCODE SQL_API SQLSetParam(HSTMT hstmt,
+                                                                                       UWORD ipar,
                                                                                        SWORD fCType,
                                                                                        SWORD fSqlType,
                                                                                        UDWORD cbColDef,
index 2d85120a2980b87907af3157fc73528c161d1be0..cd672dafca6ee5ddeec48eeb400835d72bd951fc 100644 (file)
 #include "isql.h"
 
 #define SQL_STILL_EXECUTING            2
-#define SQL_NEED_DATA                  99
+#define SQL_NEED_DATA                  99
 
 /* extend SQL datatypes */
-#define SQL_DATE                               9
-#define SQL_TIME                               10
-#define SQL_TIMESTAMP                  11
-#define SQL_LONGVARCHAR                        (-1)
-#define SQL_BINARY                             (-2)
-#define SQL_VARBINARY                  (-3)
-#define SQL_LONGVARBINARY              (-4)
-#define SQL_BIGINT                             (-5)
-#define SQL_TINYINT                            (-6)
-#define SQL_BIT                                        (-7) /* conflict with SQL3 ??? */
-#define SQL_TYPE_DRIVER_START     (-80)
+#define SQL_DATE                               9
+#define SQL_TIME                               10
+#define SQL_TIMESTAMP                  11
+#define SQL_LONGVARCHAR                        (-1)
+#define SQL_BINARY                             (-2)
+#define SQL_VARBINARY                  (-3)
+#define SQL_LONGVARBINARY              (-4)
+#define SQL_BIGINT                             (-5)
+#define SQL_TINYINT                            (-6)
+#define SQL_BIT                                        (-7)    /* conflict with SQL3 ??? */
+#define SQL_TYPE_DRIVER_START  (-80)
 
 /* C to SQL datatype mapping */
-#define SQL_C_DATE                             SQL_DATE
-#define SQL_C_TIME                             SQL_TIME
-#define SQL_C_TIMESTAMP                        SQL_TIMESTAMP
-#define SQL_C_BINARY                   SQL_BINARY
-#define SQL_C_BIT                              SQL_BIT
-#define SQL_C_TINYINT                  SQL_TINYINT
-
-#define SQL_SIGNED_OFFSET              (-20)
+#define SQL_C_DATE                             SQL_DATE
+#define SQL_C_TIME                             SQL_TIME
+#define SQL_C_TIMESTAMP                        SQL_TIMESTAMP
+#define SQL_C_BINARY                   SQL_BINARY
+#define SQL_C_BIT                              SQL_BIT
+#define SQL_C_TINYINT                  SQL_TINYINT
+
+#define SQL_SIGNED_OFFSET              (-20)
 #define SQL_UNSIGNED_OFFSET            (-22)
 
-#define SQL_C_SLONG                            (SQL_C_LONG     + SQL_SIGNED_OFFSET)
-#define SQL_C_SSHORT                   (SQL_C_SHORT + SQL_SIGNED_OFFSET)
-#define SQL_C_STINYINT                 (SQL_TINYINT + SQL_SIGNED_OFFSET)
-#define SQL_C_ULONG                            (SQL_C_LONG     + SQL_UNSIGNED_OFFSET)
-#define SQL_C_USHORT                   (SQL_C_SHORT + SQL_UNSIGNED_OFFSET)
-#define SQL_C_UTINYINT                 (SQL_TINYINT + SQL_UNSIGNED_OFFSET)
-#define SQL_C_BOOKMARK                 SQL_C_ULONG
+#define SQL_C_SLONG                            (SQL_C_LONG + SQL_SIGNED_OFFSET)
+#define SQL_C_SSHORT                   (SQL_C_SHORT + SQL_SIGNED_OFFSET)
+#define SQL_C_STINYINT                 (SQL_TINYINT + SQL_SIGNED_OFFSET)
+#define SQL_C_ULONG                            (SQL_C_LONG + SQL_UNSIGNED_OFFSET)
+#define SQL_C_USHORT                   (SQL_C_SHORT + SQL_UNSIGNED_OFFSET)
+#define SQL_C_UTINYINT                 (SQL_TINYINT + SQL_UNSIGNED_OFFSET)
+#define SQL_C_BOOKMARK                 SQL_C_ULONG
 
 #if defined(SQL_TYPE_MIN)
 #undef SQL_TYPE_MIN
-#define SQL_TYPE_MIN                   SQL_BIT
+#define SQL_TYPE_MIN                   SQL_BIT
 /* Note:If SQL_BIT uses SQL3 value (i.e. 14) then,
  *     SQL_TYPE_MIN need to be defined as SQL_TINYINT
  *     (i.e. -6).
  */
 #endif
 
-#define SQL_ALL_TYPES                  0
+#define SQL_ALL_TYPES                  0
 
 /* SQLDriverConnect flag values */
 #define SQL_DRIVER_NOPROMPT            0
 #define SQL_DRIVER_COMPLETE            1
-#define SQL_DRIVER_PROMPT              2
+#define SQL_DRIVER_PROMPT              2
 #define SQL_DRIVER_COMPLETE_REQUIRED   3
 
 /* SQLSetParam extensions */
-#define SQL_DEFAULT_PARAM              (-5)
-#define SQL_IGNORE                             (-6)
+#define SQL_DEFAULT_PARAM              (-5)
+#define SQL_IGNORE                             (-6)
 
 /* function number for SQLGetFunctions and _iodbcdm_getproc */
-#define SQL_API_SQLALLOCCONNECT        1
+#define SQL_API_SQLALLOCCONNECT                1
 #define SQL_API_SQLALLOCENV                    2
 #define SQL_API_SQLALLOCSTMT           3
-#define SQL_API_SQLBINDCOL                     4
-#define SQL_API_SQLCANCEL                      5
-#define SQL_API_SQLCOLATTRIBUTES       6
-#define SQL_API_SQLCONNECT                     7
+#define SQL_API_SQLBINDCOL                     4
+#define SQL_API_SQLCANCEL                      5
+#define SQL_API_SQLCOLATTRIBUTES       6
+#define SQL_API_SQLCONNECT                     7
 #define SQL_API_SQLDESCRIBECOL         8
 #define SQL_API_SQLDISCONNECT          9
-#define SQL_API_SQLERROR                       10
+#define SQL_API_SQLERROR                       10
 #define SQL_API_SQLEXECDIRECT          11
-#define SQL_API_SQLEXECUTE                     12
-#define SQL_API_SQLFETCH                       13
+#define SQL_API_SQLEXECUTE                     12
+#define SQL_API_SQLFETCH                       13
 #define SQL_API_SQLFREECONNECT         14
-#define SQL_API_SQLFREEENV                     15
+#define SQL_API_SQLFREEENV                     15
 #define SQL_API_SQLFREESTMT                    16
-#define SQL_API_SQLGETCURSORNAME       17
-#define SQL_API_SQLNUMRESULTCOLS       18
-#define SQL_API_SQLPREPARE                     19
+#define SQL_API_SQLGETCURSORNAME       17
+#define SQL_API_SQLNUMRESULTCOLS       18
+#define SQL_API_SQLPREPARE                     19
 #define SQL_API_SQLROWCOUNT                    20
 #define SQL_API_SQLSETCURSORNAME       21
-#define SQL_API_SQLSETPARAM                    22
-#define SQL_API_SQLTRANSACT                    23
+#define SQL_API_SQLSETPARAM                    22
+#define SQL_API_SQLTRANSACT                    23
 
-#define SQL_NUM_FUNCTIONS                      23
+#define SQL_NUM_FUNCTIONS                      23
 
-#define SQL_EXT_API_START                      40
+#define SQL_EXT_API_START                      40
 
-#define SQL_API_SQLCOLUMNS                     40
+#define SQL_API_SQLCOLUMNS                     40
 
-#define SQL_API_SQLDRIVERCONNECT       41
-#define SQL_API_SQLGETCONNECTOPTION    42
-#define SQL_API_SQLGETDATA                     43
-#define SQL_API_SQLGETFUNCTIONS        44
-#define SQL_API_SQLGETINFO                     45
-#define SQL_API_SQLGETSTMTOPTION       46
+#define SQL_API_SQLDRIVERCONNECT       41
+#define SQL_API_SQLGETCONNECTOPTION 42
+#define SQL_API_SQLGETDATA                     43
+#define SQL_API_SQLGETFUNCTIONS                44
+#define SQL_API_SQLGETINFO                     45
+#define SQL_API_SQLGETSTMTOPTION       46
 #define SQL_API_SQLGETTYPEINFO         47
 #define SQL_API_SQLPARAMDATA           48
-#define SQL_API_SQLPUTDATA                     49
+#define SQL_API_SQLPUTDATA                     49
 #define SQL_API_SQLSETCONNECTOPTION 50
-#define SQL_API_SQLSETSTMTOPTION       51
-#define SQL_API_SQLSPECIALCOLUMNS      52
+#define SQL_API_SQLSETSTMTOPTION       51
+#define SQL_API_SQLSPECIALCOLUMNS      52
 #define SQL_API_SQLSTATISTICS          53
-#define SQL_API_SQLTABLES                      54
+#define SQL_API_SQLTABLES                      54
 
-#define SQL_API_SQLBROWSECONNECT       55
+#define SQL_API_SQLBROWSECONNECT       55
 #define SQL_API_SQLCOLUMNPRIVILEGES 56
-#define SQL_API_SQLDATASOURCES         57
-#define SQL_API_SQLDESCRIBEPARAM       58
-#define SQL_API_SQLEXTENDEDFETCH       59
-#define SQL_API_SQLFOREIGNKEYS         60
-#define SQL_API_SQLMORERESULTS         61
-#define SQL_API_SQLNATIVESQL           62
-#define SQL_API_SQLNUMPARAMS           63
-#define SQL_API_SQLPARAMOPTIONS        64
-#define SQL_API_SQLPRIMARYKEYS         65
+#define SQL_API_SQLDATASOURCES         57
+#define SQL_API_SQLDESCRIBEPARAM       58
+#define SQL_API_SQLEXTENDEDFETCH       59
+#define SQL_API_SQLFOREIGNKEYS         60
+#define SQL_API_SQLMORERESULTS         61
+#define SQL_API_SQLNATIVESQL           62
+#define SQL_API_SQLNUMPARAMS           63
+#define SQL_API_SQLPARAMOPTIONS                64
+#define SQL_API_SQLPRIMARYKEYS         65
 #define SQL_API_SQLPROCEDURECOLUMNS 66
-#define SQL_API_SQLPROCEDURES          67
-#define SQL_API_SQLSETPOS                      68
+#define SQL_API_SQLPROCEDURES          67
+#define SQL_API_SQLSETPOS                      68
 #define SQL_API_SQLSETSCROLLOPTIONS 69
-#define SQL_API_SQLTABLEPRIVILEGES     70
+#define SQL_API_SQLTABLEPRIVILEGES     70
 
 #define SQL_API_SQLDRIVERS                     71
-#define SQL_API_SQLBINDPARAMETER       72
+#define SQL_API_SQLBINDPARAMETER       72
 #define SQL_EXT_API_LAST          SQL_API_SQLBINDPARAMETER
 #define SQL_NUM_EXTENSIONS     (SQL_EXT_API_LAST - SQL_EXT_API_START + 1)
 
-#define SQL_API_ALL_FUNCTIONS          0
+#define SQL_API_ALL_FUNCTIONS          0
 
 /* SQLGetInfo infor number */
-#define SQL_INFO_FIRST                         0
-#define SQL_DRIVER_HDBC                                3
-#define SQL_DRIVER_HENV                                4
-#define SQL_DRIVER_HSTMT                       5
-#define SQL_DRIVER_NAME                                6
-#define SQL_ODBC_VER                           10
-#define SQL_CURSOR_COMMIT_BEHAVIOR     23
+#define SQL_INFO_FIRST                         0
+#define SQL_DRIVER_HDBC                                3
+#define SQL_DRIVER_HENV                                4
+#define SQL_DRIVER_HSTMT                       5
+#define SQL_DRIVER_NAME                                6
+#define SQL_ODBC_VER                           10
+#define SQL_CURSOR_COMMIT_BEHAVIOR     23
 #define SQL_CURSOR_ROLLBACK_BEHAVIOR   24
-#define SQL_DEFAULT_TXN_ISOLATION      26
+#define SQL_DEFAULT_TXN_ISOLATION      26
 
-#define SQL_TXN_ISOLATION_OPTION       72
-#define SQL_NON_NULLABLE_COLUMNS       75
+#define SQL_TXN_ISOLATION_OPTION       72
+#define SQL_NON_NULLABLE_COLUMNS       75
 
-#define SQL_DRIVER_HLIB                                76
-#define SQL_DRIVER_ODBC_VER                    77
+#define SQL_DRIVER_HLIB                                76
+#define SQL_DRIVER_ODBC_VER                    77
 
-#define SQL_QUALIFIER_LOCATION         114
+#define SQL_QUALIFIER_LOCATION         114
 
-#define SQL_INFO_LAST                          SQL_QUALIFIER_LOCATION
-       
-#define SQL_INFO_DRIVER_START          1000
+#define SQL_INFO_LAST                          SQL_QUALIFIER_LOCATION
+
+#define SQL_INFO_DRIVER_START          1000
 
 
 /* SQL_TXN_ISOLATION_OPTION masks */
-#define SQL_TXN_READ_UNCOMMITTED       0x00000001L
-#define SQL_TXN_READ_COMMITTED         0x00000002L
-#define SQL_TXN_REPEATABLE_READ        0x00000004L
-#define SQL_TXN_SERIALIZABLE           0x00000008L
-#define SQL_TXN_VERSIONING                     0x00000010L
+#define SQL_TXN_READ_UNCOMMITTED       0x00000001L
+#define SQL_TXN_READ_COMMITTED         0x00000002L
+#define SQL_TXN_REPEATABLE_READ                0x00000004L
+#define SQL_TXN_SERIALIZABLE           0x00000008L
+#define SQL_TXN_VERSIONING                     0x00000010L
 
 /* SQL_CURSOR_COMMIT_BEHAVIOR and SQL_CURSOR_ROLLBACK_BEHAVIOR values */
 
-#define SQL_CB_DELETE                          0x0000
-#define SQL_CB_CLOSE                           0x0001
-#define SQL_CB_PRESERVE                                0x0002
+#define SQL_CB_DELETE                          0x0000
+#define SQL_CB_CLOSE                           0x0001
+#define SQL_CB_PRESERVE                                0x0002
 
 /* options for SQLGetStmtOption/SQLSetStmtOption */
-#define SQL_QUERY_TIMEOUT              0
-#define SQL_MAX_ROWS                   1
-#define SQL_NOSCAN                             2
-#define SQL_MAX_LENGTH                 3
-#define SQL_ASYNC_ENABLE               4
-#define SQL_BIND_TYPE                  5
-#define SQL_CURSOR_TYPE                        6
-#define SQL_CONCURRENCY                        7
-#define SQL_KEYSET_SIZE                        8
-#define SQL_ROWSET_SIZE                        9
-#define SQL_SIMULATE_CURSOR            10
-#define SQL_RETRIEVE_DATA              11
-#define SQL_USE_BOOKMARKS              12
-#define SQL_GET_BOOKMARK               13              /* GetStmtOption Only */
-#define SQL_ROW_NUMBER                 14              /* GetStmtOption Only */
-#define SQL_STMT_OPT_MAX               SQL_ROW_NUMBER
-
-#define SQL_STMT_OPT_MIN               SQL_QUERY_TIMEOUT
+#define SQL_QUERY_TIMEOUT                      0
+#define SQL_MAX_ROWS                           1
+#define SQL_NOSCAN                                     2
+#define SQL_MAX_LENGTH                         3
+#define SQL_ASYNC_ENABLE                       4
+#define SQL_BIND_TYPE                          5
+#define SQL_CURSOR_TYPE                                6
+#define SQL_CONCURRENCY                                7
+#define SQL_KEYSET_SIZE                                8
+#define SQL_ROWSET_SIZE                                9
+#define SQL_SIMULATE_CURSOR                    10
+#define SQL_RETRIEVE_DATA                      11
+#define SQL_USE_BOOKMARKS                      12
+#define SQL_GET_BOOKMARK                       13      /* GetStmtOption Only */
+#define SQL_ROW_NUMBER                         14      /* GetStmtOption Only */
+#define SQL_STMT_OPT_MAX                       SQL_ROW_NUMBER
+
+#define SQL_STMT_OPT_MIN                       SQL_QUERY_TIMEOUT
 
 /*
  * ODBC 3.0 renames the above to SQL_ATTR_ values. At this time I don't
  * know if they have also been renumbered or not, I will assume not.
  */
 #define SQL_ATTR_QUERY_TIMEOUT                 0
-#define SQL_ATTR_MAX_ROWS                              1
-#define SQL_ATTR_NOSCAN                                        2
+#define SQL_ATTR_MAX_ROWS                              1
+#define SQL_ATTR_NOSCAN                                        2
 #define SQL_ATTR_MAX_LENGTH                            3
 #define SQL_ATTR_ASYNC_ENABLE                  4
-#define SQL_ATTR_BIND_TYPE                             5
+#define SQL_ATTR_BIND_TYPE                             5
 #define SQL_ATTR_CURSOR_TYPE                   6
 #define SQL_ATTR_CONCURRENCY                   7
 #define SQL_ATTR_KEYSET_SIZE                   8
 #define SQL_ATTR_SIMULATE_CURSOR               10
 #define SQL_ATTR_RETRIEVE_DATA                 11
 #define SQL_ATTR_USE_BOOKMARKS                 12
-#define SQL_ATTR_GET_BOOKMARK                  13      /* GetStmtOption Only */
-#define SQL_ATTR_ROW_NUMBER                            14      /* GetStmtOption Only */
+#define SQL_ATTR_GET_BOOKMARK                  13              /* GetStmtOption Only */
+#define SQL_ATTR_ROW_NUMBER                            14              /* GetStmtOption Only */
 
 /* New in ODBC 3.0     */
 #define SQL_ATTR_APP_PARAM_DESC                        15
 #define SQL_ATTR_CURSOR_SCROLLABLE             17
 #define SQL_ATTR_CURSOR_SENSITITY              18
 #define SQL_ATTR_ENABLE_AUTO_IPD               19
-#define SQL_ATTR_FETCH_BOOKMARK_PTR    20
+#define SQL_ATTR_FETCH_BOOKMARK_PTR            20
 #define SQL_ATTR_IMP_PARAM_DESC                        21
 #define SQL_ATTR_IMP_ROW_DESC                  22
 #define SQL_ATTR_METADATA_ID                   23
 #define SQL_ATTR_ROW_STATUS_PTR                        33
 #define SQL_ATTR_ROWS_FETCHED_PTR              34
 
-#define SQL_STMT_ATTR_MIN              SQL_ATTR_QUERY_TIMEOUT
-#define SQL_STMT_ATTR_MAX              SQL_ATTR_ROWS_FETCHED_PTR
+#define SQL_STMT_ATTR_MIN                      SQL_ATTR_QUERY_TIMEOUT
+#define SQL_STMT_ATTR_MAX                      SQL_ATTR_ROWS_FETCHED_PTR
 
 /* SQL_QUERY_TIMEOUT options */
 #define SQL_QUERY_TIMEOUT_DEFAULT  0UL
 #define SQL_MAX_LENGTH_DEFAULT    0UL
 
 /* SQL_CONCURRENCY options */
-#define SQL_CONCUR_READ_ONLY   1
-#define SQL_CONCUR_LOCK                        2
-#define SQL_CONCUR_ROWVER              3
-#define SQL_CONCUR_VALUES              4
+#define SQL_CONCUR_READ_ONLY           1
+#define SQL_CONCUR_LOCK                                2
+#define SQL_CONCUR_ROWVER                      3
+#define SQL_CONCUR_VALUES                      4
 
 /* options for SQLSetConnectOption/SQLGetConnectOption */
-#define SQL_ACCESS_MODE                        101
-#define SQL_AUTOCOMMIT                 102
-#define SQL_LOGIN_TIMEOUT              103
-#define SQL_OPT_TRACE                  104
-#define SQL_OPT_TRACEFILE              105
-#define SQL_TRANSLATE_DLL              106
-#define SQL_TRANSLATE_OPTION   107
-#define SQL_TXN_ISOLATION              108
-#define SQL_CURRENT_QUALIFIER  109
-#define SQL_ODBC_CURSORS               110
-#define SQL_QUIET_MODE                 111
-#define SQL_PACKET_SIZE                        112
-#define SQL_CONN_OPT_MAX               SQL_PACKET_SIZE
-#define SQL_CONNECT_OPT_DRVR_START 1000
-
-#define SQL_CONN_OPT_MIN               SQL_ACCESS_MODE
+#define SQL_ACCESS_MODE                                101
+#define SQL_AUTOCOMMIT                         102
+#define SQL_LOGIN_TIMEOUT                      103
+#define SQL_OPT_TRACE                          104
+#define SQL_OPT_TRACEFILE                      105
+#define SQL_TRANSLATE_DLL                      106
+#define SQL_TRANSLATE_OPTION           107
+#define SQL_TXN_ISOLATION                      108
+#define SQL_CURRENT_QUALIFIER          109
+#define SQL_ODBC_CURSORS                       110
+#define SQL_QUIET_MODE                         111
+#define SQL_PACKET_SIZE                                112
+#define SQL_CONN_OPT_MAX                       SQL_PACKET_SIZE
+#define SQL_CONNECT_OPT_DRVR_START     1000
+
+#define SQL_CONN_OPT_MIN                       SQL_ACCESS_MODE
 
 /* SQL_ACCESS_MODE options */
-#define SQL_MODE_READ_WRITE            0UL
-#define SQL_MODE_READ_ONLY             1UL
-#define SQL_MODE_DEFAULT               SQL_MODE_READ_WRITE
+#define SQL_MODE_READ_WRITE                    0UL
+#define SQL_MODE_READ_ONLY                     1UL
+#define SQL_MODE_DEFAULT                       SQL_MODE_READ_WRITE
 
 /* SQL_AUTOCOMMIT options */
-#define SQL_AUTOCOMMIT_OFF             0UL
-#define SQL_AUTOCOMMIT_ON              1UL
-#define SQL_AUTOCOMMIT_DEFAULT SQL_AUTOCOMMIT_ON
+#define SQL_AUTOCOMMIT_OFF                     0UL
+#define SQL_AUTOCOMMIT_ON                      1UL
+#define SQL_AUTOCOMMIT_DEFAULT         SQL_AUTOCOMMIT_ON
 
 /* SQL_LOGIN_TIMEOUT options */
-#define SQL_LOGIN_TIMEOUT_DEFAULT  15UL
+#define SQL_LOGIN_TIMEOUT_DEFAULT      15UL
 
 /* SQL_OPT_TRACE options */
-#define SQL_OPT_TRACE_OFF              0UL
-#define SQL_OPT_TRACE_ON               1UL
-#define SQL_OPT_TRACE_DEFAULT  SQL_OPT_TRACE_OFF
-#define SQL_OPT_TRACE_FILE_DEFAULT "odbc.log"
+#define SQL_OPT_TRACE_OFF                      0UL
+#define SQL_OPT_TRACE_ON                       1UL
+#define SQL_OPT_TRACE_DEFAULT          SQL_OPT_TRACE_OFF
+#define SQL_OPT_TRACE_FILE_DEFAULT     "odbc.log"
 
 /* SQL_ODBC_CURSORS options */
-#define SQL_CUR_USE_IF_NEEDED  0UL
-#define SQL_CUR_USE_ODBC               1UL
-#define SQL_CUR_USE_DRIVER             2UL
-#define SQL_CUR_DEFAULT                        SQL_CUR_USE_DRIVER
+#define SQL_CUR_USE_IF_NEEDED          0UL
+#define SQL_CUR_USE_ODBC                       1UL
+#define SQL_CUR_USE_DRIVER                     2UL
+#define SQL_CUR_DEFAULT                                SQL_CUR_USE_DRIVER
 
 /* Column types and scopes in SQLSpecialColumns. */
-#define SQL_BEST_ROWID                 1
-#define SQL_ROWVER                             2
+#define SQL_BEST_ROWID                         1
+#define SQL_ROWVER                                     2
 
-#define SQL_SCOPE_CURROW               0
-#define SQL_SCOPE_TRANSACTION  1
-#define SQL_SCOPE_SESSION              2
+#define SQL_SCOPE_CURROW                       0
+#define SQL_SCOPE_TRANSACTION          1
+#define SQL_SCOPE_SESSION                      2
 
 
 /* SQLExtendedFetch flag values */
-#define SQL_FETCH_NEXT                 1
-#define SQL_FETCH_FIRST                        2
-#define SQL_FETCH_LAST                 3
-#define SQL_FETCH_PRIOR                        4
-#define SQL_FETCH_ABSOLUTE             5
-#define SQL_FETCH_RELATIVE             6
-#define SQL_FETCH_BOOKMARK             8
+#define SQL_FETCH_NEXT                         1
+#define SQL_FETCH_FIRST                                2
+#define SQL_FETCH_LAST                         3
+#define SQL_FETCH_PRIOR                                4
+#define SQL_FETCH_ABSOLUTE                     5
+#define SQL_FETCH_RELATIVE                     6
+#define SQL_FETCH_BOOKMARK                     8
 
 /* Defines for SQLBindParameter/SQLProcedureColumns */
-#define SQL_PARAM_TYPE_UNKNOWN 0
-#define SQL_PARAM_INPUT                        1
-#define SQL_PARAM_INPUT_OUTPUT 2
-#define SQL_RESULT_COL                 3
-#define SQL_PARAM_OUTPUT               4
-#define SQL_RETURN_VALUE               5
+#define SQL_PARAM_TYPE_UNKNOWN         0
+#define SQL_PARAM_INPUT                                1
+#define SQL_PARAM_INPUT_OUTPUT         2
+#define SQL_RESULT_COL                         3
+#define SQL_PARAM_OUTPUT                       4
+#define SQL_RETURN_VALUE                       5
 
 /* Defines used by Driver Manager for mapping SQLSetParam to SQLBindParameter */
-#define SQL_PARAM_TYPE_DEFAULT SQL_PARAM_INPUT_OUTPUT
-#define SQL_SETPARAM_VALUE_MAX (-1L)
+#define SQL_PARAM_TYPE_DEFAULT         SQL_PARAM_INPUT_OUTPUT
+#define SQL_SETPARAM_VALUE_MAX         (-1L)
 
 /* SQLStatistics flag values */
-#define SQL_INDEX_UNIQUE               0
-#define SQL_INDEX_ALL                  1
+#define SQL_INDEX_UNIQUE                       0
+#define SQL_INDEX_ALL                          1
 
-#define SQL_QUICK                              0
-#define SQL_ENSURE                             1
+#define SQL_QUICK                                      0
+#define SQL_ENSURE                                     1
 
 /* SQLSetScrollOption flag values */
-#define SQL_SCROLL_FORWARD_ONLY        0L
+#define SQL_SCROLL_FORWARD_ONLY                0L
 #define SQL_SCROLL_KEYSET_DRIVEN       (-1L)
-#define SQL_SCROLL_DYNAMIC             (-2L)
-#define SQL_SCROLL_STATIC              (-3L)
+#define SQL_SCROLL_DYNAMIC                     (-2L)
+#define SQL_SCROLL_STATIC                      (-3L)
 
 /* Everything below has been added to the original isqlext.h that comes
  * with iodbc.
@@ -496,24 +496,24 @@ typedef struct tagSQL_INTERVAL_STRUCT
 #define SQL_CODE_HOUR_TO_SECOND
 #define SQL_CODE_MINUTE_TO_SECOND
 */
-#define SQL_INTERVAL_YEAR                      (-80)
-#define SQL_INTERVAL_MONTH                     (-81)
-#define SQL_INTERVAL_YEAR_TO_MONTH     (-82)
-#define SQL_INTERVAL_DAY                       (-83)
-#define SQL_INTERVAL_HOUR                      (-84)
-#define SQL_INTERVAL_MINUTE                    (-85)
-#define SQL_INTERVAL_SECOND                    (-86)
-#define SQL_INTERVAL_DAY_TO_HOUR       (-87)
-#define SQL_INTERVAL_DAY_TO_MINUTE     (-88)
-#define SQL_INTERVAL_DAY_TO_SECOND     (-89)
-#define SQL_INTERVAL_HOUR_TO_MINUTE (-90)
-#define SQL_INTERVAL_HOUR_TO_SECOND (-91)
+#define SQL_INTERVAL_YEAR                              (-80)
+#define SQL_INTERVAL_MONTH                             (-81)
+#define SQL_INTERVAL_YEAR_TO_MONTH             (-82)
+#define SQL_INTERVAL_DAY                               (-83)
+#define SQL_INTERVAL_HOUR                              (-84)
+#define SQL_INTERVAL_MINUTE                            (-85)
+#define SQL_INTERVAL_SECOND                            (-86)
+#define SQL_INTERVAL_DAY_TO_HOUR               (-87)
+#define SQL_INTERVAL_DAY_TO_MINUTE             (-88)
+#define SQL_INTERVAL_DAY_TO_SECOND             (-89)
+#define SQL_INTERVAL_HOUR_TO_MINUTE            (-90)
+#define SQL_INTERVAL_HOUR_TO_SECOND            (-91)
 #define SQL_INTERVAL_MINUTE_TO_SECOND  (-92)
 
-#define SQL_UNICODE                                    (-95)
-#define SQL_UNICODE_VARCHAR                    (-96)
-#define SQL_UNICODE_LONGVARCHAR                (-97)
-#define SQL_UNICODE_CHAR                       SQL_UNICODE
+#define SQL_UNICODE                                            (-95)
+#define SQL_UNICODE_VARCHAR                            (-96)
+#define SQL_UNICODE_LONGVARCHAR                        (-97)
+#define SQL_UNICODE_CHAR                               SQL_UNICODE
 
 /* C to SQL data types */
 /*
@@ -547,11 +547,11 @@ typedef struct tagSQL_INTERVAL_STRUCT
 #define SQL_NO_TOTAL                   (-4)
 
 /* SQLBindParameter */
-#define SQL_LEN_DATA_AT_EXEC_OFFSET    (-100)
+#define SQL_LEN_DATA_AT_EXEC_OFFSET            (-100)
 #define SQL_LEN_DATA_AT_EXEC(length)   (-length+SQL_LEN_DATA_AT_EXEC_OFFSET)
 
 #define SQL_LEN_BINARY_ATTR_OFFSET             (-100)
-#define SQL_LEN_BINARY_ATTR(length)    (-(length)+SQL_LEN_BINARY_ATTR_OFFSET)
+#define SQL_LEN_BINARY_ATTR(length)            (-(length)+SQL_LEN_BINARY_ATTR_OFFSET)
 
 /* SQLExtendedFetch - row status */
 #define SQL_ROW_SUCCESS                        0
@@ -565,7 +565,7 @@ typedef struct tagSQL_INTERVAL_STRUCT
 #define SQL_CASCADE                            0
 #define SQL_RESTRICT                   1
 #define SQL_SET_NULL                   2
-#define SQL_NO_ACTION                  3       /* ODBC 3.0 */
+#define SQL_NO_ACTION                  3               /* ODBC 3.0 */
 #define SQL_SET_DEFAULT                        4
 
 /* SQLForeignKeys - Deferrability (ODBC 3.0) */
@@ -724,7 +724,7 @@ typedef struct tagSQL_INTERVAL_STRUCT
 #define SQL_CVT_REAL                   0x00000040L
 #define SQL_CVT_DOUBLE                 0x00000080L
 #define SQL_CVT_VARCHAR                        0x00000100L
-#define SQL_CVT_LONGVARCHAR    0x00000200L
+#define SQL_CVT_LONGVARCHAR            0x00000200L
 #define SQL_CVT_BINARY                 0x00000400L
 #define SQL_CVT_VARBINARY              0x00000800L
 #define SQL_CVT_BIT                            0x00001000L
@@ -939,10 +939,10 @@ typedef struct tagSQL_INTERVAL_STRUCT
 /*
  *     SQLSetPos
  */
-#define SQL_ENTIRE_ROWSET              0
+#define SQL_ENTIRE_ROWSET      0
 
 #define SQL_POSITION   0
-#define SQL_REFRESH    1
+#define SQL_REFRESH            1
 #define SQL_UPDATE             2
 #define SQL_DELETE             3
 #define SQL_ADD                        4
@@ -1005,21 +1005,21 @@ typedef struct tagSQL_INTERVAL_STRUCT
  * Scroll Concurrency. A SQLINTEGER bitmask enumerating the concurrency
  * control options supported for the cursor. Depreciated in ODBC 3.0.
  */
-#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                     0x00000001L
+#define SQL_SCCO_LOCK                          0x00000002L
+#define SQL_SCCO_OPT_ROWVER                    0x00000004L
+#define SQL_SCCO_OPT_VALUES                    0x00000008L
 
 
 /*
  * Scroll Options. A SQLUINTEGER bitmask enumerating the scroll options
  * supported for scrollable cursors.
  */
-#define SQL_SO_FORWARD_ONLY            0x00000001L
-#define SQL_SO_KEYSET_DRIVEN   0x00000002L
-#define SQL_SO_DYNAMIC                 0x00000004L
-#define SQL_SO_MIXED                   0x00000008L
-#define SQL_SO_STATIC                  0x00000010L
+#define SQL_SO_FORWARD_ONLY                    0x00000001L
+#define SQL_SO_KEYSET_DRIVEN           0x00000002L
+#define SQL_SO_DYNAMIC                         0x00000004L
+#define SQL_SO_MIXED                           0x00000008L
+#define SQL_SO_STATIC                          0x00000010L
 
 /*
  * Static Sensitity. A SQLINTEGER bitmask enumerating whether changes made
@@ -1027,33 +1027,33 @@ typedef struct tagSQL_INTERVAL_STRUCT
  * or positioned update or delete statements can be detected by that
  * application.
  */
-#define SQL_SS_ADDITIONS               0x00000001L
-#define SQL_SS_DELETIONS               0x00000002L
-#define SQL_SS_UPDATES                 0x00000004L
+#define SQL_SS_ADDITIONS                       0x00000001L
+#define SQL_SS_DELETIONS                       0x00000002L
+#define SQL_SS_UPDATES                         0x00000004L
 
 /*
  * String Functions. A SQLUINTEGER bitmask enumerating the scalar string
  * functions supported by the driver and associated data source.
  */
-#define SQL_FN_STR_CONCAT              0x00000001L
-#define SQL_FN_STR_INSERT              0x00000002L
-#define SQL_FN_STR_LEFT                        0x00000004L
-#define SQL_FN_STR_LTRIM               0x00000008L
-#define SQL_FN_STR_LENGTH              0x00000010L
-#define SQL_FN_STR_LOCATE              0x00000020L
-#define SQL_FN_STR_LCASE               0x00000040L
-#define SQL_FN_STR_REPEAT              0x00000080L
-#define SQL_FN_STR_REPLACE             0x00000100L
-#define SQL_FN_STR_RIGHT               0x00000200L
-#define SQL_FN_STR_RTRIM               0x00000400L
-#define SQL_FN_STR_SUBSTRING   0x00000800L
-#define SQL_FN_STR_UCASE               0x00001000L
-#define SQL_FN_STR_ASCII               0x00002000L
-#define SQL_FN_STR_CHAR                        0x00004000L
-#define SQL_FN_STR_DIFFERENCE  0x00008000L
-#define SQL_FN_STR_LOCATE_2            0x00010000L
-#define SQL_FN_STR_SOUNDEX             0x00020000L
-#define SQL_FN_STR_SPACE               0x00040000L
+#define SQL_FN_STR_CONCAT                      0x00000001L
+#define SQL_FN_STR_INSERT                      0x00000002L
+#define SQL_FN_STR_LEFT                                0x00000004L
+#define SQL_FN_STR_LTRIM                       0x00000008L
+#define SQL_FN_STR_LENGTH                      0x00000010L
+#define SQL_FN_STR_LOCATE                      0x00000020L
+#define SQL_FN_STR_LCASE                       0x00000040L
+#define SQL_FN_STR_REPEAT                      0x00000080L
+#define SQL_FN_STR_REPLACE                     0x00000100L
+#define SQL_FN_STR_RIGHT                       0x00000200L
+#define SQL_FN_STR_RTRIM                       0x00000400L
+#define SQL_FN_STR_SUBSTRING           0x00000800L
+#define SQL_FN_STR_UCASE                       0x00001000L
+#define SQL_FN_STR_ASCII                       0x00002000L
+#define SQL_FN_STR_CHAR                                0x00004000L
+#define SQL_FN_STR_DIFFERENCE          0x00008000L
+#define SQL_FN_STR_LOCATE_2                    0x00010000L
+#define SQL_FN_STR_SOUNDEX                     0x00020000L
+#define SQL_FN_STR_SPACE                       0x00040000L
 
 /* introduced in ODBC 3.0 */
 #define SQL_FN_STR_BIT_LENGTH          0x00080000L
@@ -1066,100 +1066,100 @@ typedef struct tagSQL_INTERVAL_STRUCT
  * Subqueries. A SQLUINTEGER bitmask enumerating the predicates that support
  * subqueries.
  */
-#define SQL_SQ_COMPARISON              0x00000001L
-#define SQL_SQ_EXISTS                  0x00000002L
-#define SQL_SQ_IN                              0x00000004L
-#define SQL_SQ_QUANTIFIED              0x00000008L
+#define SQL_SQ_COMPARISON                      0x00000001L
+#define SQL_SQ_EXISTS                          0x00000002L
+#define SQL_SQ_IN                                      0x00000004L
+#define SQL_SQ_QUANTIFIED                      0x00000008L
 #define SQL_SQ_CORRELATED_SUBQUERIES   0x00000010L
 
 /*
  * System Functions. A SQLUINTEGER bitmask enumerating the scalar system
  * functions supported by the driver and associated data source.
  */
-#define SQL_FN_SYS_USERNAME            0x00000001L
-#define SQL_FN_SYS_DBNAME              0x00000002L
-#define SQL_FN_SYS_IFNULL              0x00000004L
+#define SQL_FN_SYS_USERNAME                    0x00000001L
+#define SQL_FN_SYS_DBNAME                      0x00000002L
+#define SQL_FN_SYS_IFNULL                      0x00000004L
 
 /*
  * Time-Date add and diff intervals. A SQLUINTEGER bitmask enumerating the
  * timestamp intervals supported by the driver and associated data source
  *     for the TIMESTAMPADD and TIMESTAMPDIFF scalar function.
  */
-#define SQL_FN_TSI_FRAC_SECOND 0x00000001L
-#define SQL_FN_TSI_SECOND              0x00000002L
-#define SQL_FN_TSI_MINUTE              0x00000004L
-#define SQL_FN_TSI_HOUR                        0x00000008L
-#define SQL_FN_TSI_DAY                 0x00000010L
-#define SQL_FN_TSI_WEEK                        0x00000020L
-#define SQL_FN_TSI_MONTH               0x00000040L
-#define SQL_FN_TSI_QUARTER             0x00000080L
-#define SQL_FN_TSI_YEAR                        0x00000100L
+#define SQL_FN_TSI_FRAC_SECOND         0x00000001L
+#define SQL_FN_TSI_SECOND                      0x00000002L
+#define SQL_FN_TSI_MINUTE                      0x00000004L
+#define SQL_FN_TSI_HOUR                                0x00000008L
+#define SQL_FN_TSI_DAY                         0x00000010L
+#define SQL_FN_TSI_WEEK                                0x00000020L
+#define SQL_FN_TSI_MONTH                       0x00000040L
+#define SQL_FN_TSI_QUARTER                     0x00000080L
+#define SQL_FN_TSI_YEAR                                0x00000100L
 
 /*
  * Time/Date functions. A SQLUINTEGER bitmask enumerating the scalar date
  * and time functions supported by the driver and associated data source.
  */
-#define SQL_FN_TD_NOW                  0x00000001L
-#define SQL_FN_TD_CURDATE              0x00000002L
-#define SQL_FN_TD_DAYOFMONTH   0x00000004L
-#define SQL_FN_TD_DAYOFWEEK            0x00000008L
-#define SQL_FN_TD_DAYOFYEAR            0x00000010L
-#define SQL_FN_TD_MONTH                        0x00000020L
-#define SQL_FN_TD_QUARTER              0x00000040L
-#define SQL_FN_TD_WEEK                 0x00000080L
-#define SQL_FN_TD_YEAR                 0x00000100L
-#define SQL_FN_TD_CURTIME              0x00000200L
-#define SQL_FN_TD_HOUR                 0x00000400L
-#define SQL_FN_TD_MINUTE               0x00000800L
-#define SQL_FN_TD_SECOND               0x00001000L
-#define SQL_FN_TD_TIMESTAMPADD 0x00002000L
-#define SQL_FN_TD_TIMESTAMPDIFF        0x00004000L
-#define SQL_FN_TD_DAYNAME              0x00008000L
-#define SQL_FN_TD_MONTHNAME            0x00010000L
+#define SQL_FN_TD_NOW                          0x00000001L
+#define SQL_FN_TD_CURDATE                      0x00000002L
+#define SQL_FN_TD_DAYOFMONTH           0x00000004L
+#define SQL_FN_TD_DAYOFWEEK                    0x00000008L
+#define SQL_FN_TD_DAYOFYEAR                    0x00000010L
+#define SQL_FN_TD_MONTH                                0x00000020L
+#define SQL_FN_TD_QUARTER                      0x00000040L
+#define SQL_FN_TD_WEEK                         0x00000080L
+#define SQL_FN_TD_YEAR                         0x00000100L
+#define SQL_FN_TD_CURTIME                      0x00000200L
+#define SQL_FN_TD_HOUR                         0x00000400L
+#define SQL_FN_TD_MINUTE                       0x00000800L
+#define SQL_FN_TD_SECOND                       0x00001000L
+#define SQL_FN_TD_TIMESTAMPADD         0x00002000L
+#define SQL_FN_TD_TIMESTAMPDIFF                0x00004000L
+#define SQL_FN_TD_DAYNAME                      0x00008000L
+#define SQL_FN_TD_MONTHNAME                    0x00010000L
 
 /* Added in ODBC 3.0 */
-#define SQL_FN_TD_CURRENT_DATE 0x00020000L
-#define SQL_FN_TD_CURRENT_TIME 0x00040000L
+#define SQL_FN_TD_CURRENT_DATE         0x00020000L
+#define SQL_FN_TD_CURRENT_TIME         0x00040000L
 #define SQL_FN_TD_CURRENT_TIMESTAMP 0x00080000L
-#define SQL_FN_TD_EXTRACT              0x00100000L
+#define SQL_FN_TD_EXTRACT                      0x00100000L
 
 /*
  * Transaction Capable. A SQLUSMALLINT value describing the transaction
  * support in the driver or data source.
  */
-#define SQL_TC_NONE                            0x0000
-#define SQL_TC_DML                             0x0001
-#define SQL_TC_ALL                             0x0002
-#define SQL_TC_DDL_COMMIT              0x0003
-#define SQL_TC_DDL_IGNORE              0x0004
+#define SQL_TC_NONE                                    0x0000
+#define SQL_TC_DML                                     0x0001
+#define SQL_TC_ALL                                     0x0002
+#define SQL_TC_DDL_COMMIT                      0x0003
+#define SQL_TC_DDL_IGNORE                      0x0004
 
 /*
  * Unions. A SQLUINTEGER bitmask enumerating the support for the UNION
  * clause.
  */
-#define SQL_U_UNION                            0x00000001L
-#define SQL_U_UNION_ALL                        0x00000002L
+#define SQL_U_UNION                                    0x00000001L
+#define SQL_U_UNION_ALL                                0x00000002L
 
 
 /* SQLStatistics: Type, Smallint */
-#define SQL_TABLE_STAT                 0
-#define SQL_INDEX_CLUSTERED    1
-#define SQL_INDEX_HASHED               2
-#define SQL_INDEX_OTHER                        3
+#define SQL_TABLE_STAT                         0
+#define SQL_INDEX_CLUSTERED                    1
+#define SQL_INDEX_HASHED                       2
+#define SQL_INDEX_OTHER                                3
 
 /* SQLProcedures: Type: Smallint */
-#define SQL_PT_UNKNOWN                 0
-#define SQL_PT_PROCEDURE               1
-#define SQL_PT_FUNCTION                        2
+#define SQL_PT_UNKNOWN                         0
+#define SQL_PT_PROCEDURE                       1
+#define SQL_PT_FUNCTION                                2
 
 /* SQLSpecialColumns: PSEUDO_COLUMN: Smallint */
-#define SQL_PC_UNKNOWN                 0
-#define SQL_PC_PSEUDO                  1
-#define SQL_PC_NOT_PSEUDO              2
+#define SQL_PC_UNKNOWN                         0
+#define SQL_PC_PSEUDO                          1
+#define SQL_PC_NOT_PSEUDO                      2
 
 /* SQLSet/Get/StmtOptions: ASYNC_ENABLE. A SQLUINTEGER */
-#define SQL_ASYNC_ENABLE_OFF   0UL
-#define SQL_ASYNC_ENABLE_ON            1UL
+#define SQL_ASYNC_ENABLE_OFF           0UL
+#define SQL_ASYNC_ENABLE_ON                    1UL
 #define SQL_ASYNC_ENABLE_DEFAULT       SQL_ASYNC_ENABLE_OFF
 
 /*
@@ -1172,17 +1172,17 @@ typedef struct tagSQL_INTERVAL_STRUCT
  * SQLSet/GetStmtOptions: CURSOR_SCROLLABLE. A SQLUINTEGER. Added in ODBC
  * 3.0.
  */
-#define SQL_NONSCROLLABLE              0UL
-#define SQL_SCROLLABLE                 1UL
+#define SQL_NONSCROLLABLE                              0UL
+#define SQL_SCROLLABLE                                 1UL
 #define SQL_CURSOR_SCROLLABLE_DEFAULT  SQL_NONSCROLLABLE
 
 /*
  * SQLSet/GetStmtOptions: CURSOR_SENSITITY. A SQLUINTEGER. Added in ODBC
  * 3.0.
  */
-#define SQL_UNSPECIFIED                        0UL
-#define SQL_INSENSITIVE                        1UL
-#define SQL_SENSITIVIE                 2UL
+#define SQL_UNSPECIFIED                                0UL
+#define SQL_INSENSITIVE                                1UL
+#define SQL_SENSITIVIE                         2UL
 #define SQL_CURSOR_SENSITIVITY_DEFAULT SQL_UNSPECIFIED
 
 /*
@@ -1273,29 +1273,29 @@ typedef struct tagSQL_INTERVAL_STRUCT
  * SQLSet/GetStmtOptions: USE_BOOKMARKS: SQLUINTEGER value that specifies
  * whether an application will use bookmarks with a cursor.
  */
-#define SQL_UB_OFF                             0UL
-#define SQL_UB_ON                              1UL
-#define SQL_UB_FIXED                   SQL_UB_ON       /* Deprecated in ODBC 3.0 */
-#define SQL_UB_VARIABLE                        2UL /* Added in ODBC 3.0 */
-#define SQL_UB_DEFAULT                 SQL_UB_OFF
+#define SQL_UB_OFF                                     0UL
+#define SQL_UB_ON                                      1UL
+#define SQL_UB_FIXED                           SQL_UB_ON       /* Deprecated in ODBC 3.0 */
+#define SQL_UB_VARIABLE                                2UL /* Added in ODBC 3.0 */
+#define SQL_UB_DEFAULT                         SQL_UB_OFF
 
 /* Deprecated */
-#define SQL_DATABASE_NAME              16
-#define SQL_FD_FETCH_PREV              SQL_FD_FETCH_PRIOR
-#define SQL_FETCH_PREV                 SQL_FETCH_PRIOR
-#define SQL_CONCUR_TIMESTAMP   SQL_CONCUR_ROWVER
-#define SQL_SCCO_OPT_TIMESTAMP SQL_SCCO_OPT_ROWVER
-#define SQL_CC_DELETE                  SQL_CB_DELETE
-#define SQL_CR_DELETE                  SQL_CB_DELETE
-#define SQL_CC_CLOSE                   SQL_CB_CLOSE
-#define SQL_CR_CLOSE                   SQL_CB_CLOSE
-#define SQL_CC_PRESERVE                        SQL_CB_PRESERVE
-#define SQL_CR_PRESERVE                        SQL_CB_PRESERVE
-#define SQL_FETCH_RESUME                               7
-#define SQL_SCROLL_FORWARD_ONLY        0L
+#define SQL_DATABASE_NAME                      16
+#define SQL_FD_FETCH_PREV                      SQL_FD_FETCH_PRIOR
+#define SQL_FETCH_PREV                         SQL_FETCH_PRIOR
+#define SQL_CONCUR_TIMESTAMP           SQL_CONCUR_ROWVER
+#define SQL_SCCO_OPT_TIMESTAMP         SQL_SCCO_OPT_ROWVER
+#define SQL_CC_DELETE                          SQL_CB_DELETE
+#define SQL_CR_DELETE                          SQL_CB_DELETE
+#define SQL_CC_CLOSE                           SQL_CB_CLOSE
+#define SQL_CR_CLOSE                           SQL_CB_CLOSE
+#define SQL_CC_PRESERVE                                SQL_CB_PRESERVE
+#define SQL_CR_PRESERVE                                SQL_CB_PRESERVE
+#define SQL_FETCH_RESUME                       7
+#define SQL_SCROLL_FORWARD_ONLY                0L
 #define SQL_SCROLL_KEYSET_DRIVEN       (-1L)
-#define SQL_SCROLL_DYNAMIC             (-2L)
-#define SQL_SCROLL_STATIC              (-3L)
+#define SQL_SCROLL_DYNAMIC                     (-2L)
+#define SQL_SCROLL_STATIC                      (-3L)
 
 /*
  *     ODBC keywords
index e5e916465eda201503ca769806cf71e4aed71dff..f47bf880174045b3d43240590b71afa17edd5a60 100644 (file)
@@ -39,7 +39,7 @@
 
 
 #ifdef MY_LOG
-#define MYLOGFILE "mylog_"
+#define MYLOGFILE      "mylog_"
 #ifndef WIN32
 #define MYLOGDIR       "/tmp"
 #else
@@ -56,7 +56,7 @@ extern void mylog(char *fmt,...);
 #endif
 
 #ifdef Q_LOG
-#define QLOGFILE  "psqlodbc_"
+#define QLOGFILE       "psqlodbc_"
 #ifndef WIN32
 #define QLOGDIR                "/tmp"
 #else
@@ -79,13 +79,13 @@ extern void qlog(char *fmt,...);
 #endif
 
 #ifdef WIN32
-#define PG_BINARY      O_BINARY
-#define PG_BINARY_R "rb"
-#define PG_BINARY_W "wb"
+#define PG_BINARY              O_BINARY
+#define PG_BINARY_R            "rb"
+#define PG_BINARY_W            "wb"
 #else
-#define PG_BINARY      0
-#define PG_BINARY_R "r"
-#define PG_BINARY_W "w"
+#define PG_BINARY              0
+#define PG_BINARY_R            "r"
+#define PG_BINARY_W            "w"
 #endif
 
 
index 39f2640f21f277800a0438a6eb75e03d74a777e2..0c024dd11e38567a6ae6c793a0d06871a88c3a4d 100644 (file)
 #define PG_TYPE_OIDINT2                810
 #define PG_TYPE_OIDINT4                910
 #define PG_TYPE_OIDNAME                911
-#define PG_TYPE_BPCHAR         1042
-#define PG_TYPE_VARCHAR        1043
-#define PG_TYPE_DATE           1082
-#define PG_TYPE_TIME           1083
-#define PG_TYPE_DATETIME       1184
-#define PG_TYPE_TIMESTAMP      1296
-#define PG_TYPE_NUMERIC        1700
+#define PG_TYPE_BPCHAR         1042
+#define PG_TYPE_VARCHAR                1043
+#define PG_TYPE_DATE           1082
+#define PG_TYPE_TIME           1083
+#define PG_TYPE_DATETIME       1184
+#define PG_TYPE_TIMESTAMP      1296
+#define PG_TYPE_NUMERIC                1700
 
 /* extern Int4 pgtypes_defined[]; */
 extern Int2 sqlTypes[];
index 8c7138d1a37562ab9dde18cc8c507b01e8b2fb2d..7ee777ed39064f364a6b676535e741742823418e 100644 (file)
@@ -6,7 +6,7 @@
  *
  * Comments:           See "notice.txt" for copyright and license information.
  *
- * $Id: psqlodbc.h,v 1.35 2001/02/11 05:58:41 momjian Exp $
+ * $Id: psqlodbc.h,v 1.36 2001/02/11 13:53:42 momjian Exp $
  */
 
 #ifndef __PSQLODBC_H__
@@ -36,11 +36,11 @@ typedef double SDOUBLE;
 typedef UInt4 Oid;
 
 /* Driver stuff */
-#define ODBCVER                                0x0250
-#define DRIVER_ODBC_VER                "02.50"
+#define ODBCVER                                        0x0250
+#define DRIVER_ODBC_VER                        "02.50"
 
-#define DRIVERNAME                     "PostgreSQL ODBC"
-#define DBMS_NAME                      "PostgreSQL"
+#define DRIVERNAME                             "PostgreSQL ODBC"
+#define DBMS_NAME                              "PostgreSQL"
 
 #define POSTGRESDRIVERVERSION  "07.01.0003"
 
@@ -55,18 +55,17 @@ typedef UInt4 Oid;
 #define BLCKSZ                                 4096
 #endif
 
-#define MAX_MESSAGE_LEN                        65536           /* This puts a limit on
-                                                                                                * query size but I don't */
+#define MAX_MESSAGE_LEN                        65536   /* This puts a limit on query size
+                                                                                * but I don't */
  /* see an easy way round this - DJP 24-1-2001 */
 #define MAX_CONNECT_STRING             4096
 #define ERROR_MSG_LENGTH               4096
-#define FETCH_MAX                              100 /* default number of rows to cache
-                                                                        * for declare/fetch */
+#define FETCH_MAX                              100             /* default number of rows to cache
+                                                                                * for declare/fetch */
 #define TUPLE_MALLOC_INC               100
-#define SOCK_BUFFER_SIZE               4096            /* default socket buffer
-                                                                                                * size */
-#define MAX_CONNECTIONS                        128 /* conns per environment
-                                                                        * (arbitrary)  */
+#define SOCK_BUFFER_SIZE               4096    /* default socket buffer size */
+#define MAX_CONNECTIONS                        128             /* conns per environment
+                                                                                * (arbitrary)  */
 #define MAX_FIELDS                             512
 #define BYTELEN                                        8
 #define VARHDRSZ                               sizeof(Int4)
@@ -76,24 +75,25 @@ typedef UInt4 Oid;
 #define MAX_CURSOR_LEN                 32
 
 /*     Registry length limits */
-#define LARGE_REGISTRY_LEN             4096            /* used for special cases */
-#define MEDIUM_REGISTRY_LEN            256 /* normal size for
+#define LARGE_REGISTRY_LEN             4096    /* used for special cases */
+#define MEDIUM_REGISTRY_LEN            256             /* normal size for
                                                                                 * user,database,etc. */
-#define SMALL_REGISTRY_LEN             10      /* for 1/0 settings */
+#define SMALL_REGISTRY_LEN             10              /* for 1/0 settings */
 
 
 /*     These prefixes denote system tables */
-#define POSTGRES_SYS_PREFIX    "pg_"
+#define POSTGRES_SYS_PREFIX            "pg_"
 #define KEYS_TABLE                             "dd_fkey"
 
 /*     Info limits */
 #define MAX_INFO_STRING                        128
 #define MAX_KEYPARTS                   20
-#define MAX_KEYLEN                             512 /* max key of the form
-                                                                        * "date+outlet+invoice" */
-#define MAX_ROW_SIZE                   0       /* Unlimited rowsize with the Tuple
-                                                                        * Toaster */
-#define MAX_STATEMENT_LEN              0       /* Unlimited statement size with 7.0 */
+#define MAX_KEYLEN                             512             /* max key of the form
+                                                                                * "date+outlet+invoice" */
+#define MAX_ROW_SIZE                   0               /* Unlimited rowsize with the
+                                                                                * Tuple Toaster */
+#define MAX_STATEMENT_LEN              0               /* Unlimited statement size with
+                                                                                * 7.0 */
 
 /* Previously, numerous query strings were defined of length MAX_STATEMENT_LEN */
 /* Now that's 0, lets use this instead. DJP 24-1-2001 */
@@ -172,17 +172,18 @@ typedef struct QueryInfo_
 } QueryInfo;
 
 
-#define PG_TYPE_LO                             -999    /* hack until permanent type
-                                                                                * available */
-#define PG_TYPE_LO_NAME                        "lo"
-#define OID_ATTNUM                             -2              /* the attnum in pg_index of the
+#define PG_TYPE_LO                                     -999            /* hack until permanent
+                                                                                                * type available */
+#define PG_TYPE_LO_NAME                                "lo"
+#define OID_ATTNUM                                     -2      /* the attnum in pg_index of the
                                                                                 * oid */
 
 /* sizes */
-#define TEXT_FIELD_SIZE                        8190    /* size of text fields (not
-                                                                                * including null term) */
-#define NAME_FIELD_SIZE                        32              /* size of name fields */
-#define MAX_VARCHAR_SIZE               254             /* maximum size of a varchar (not
+#define TEXT_FIELD_SIZE                                8190            /* size of text fields
+                                                                                                * (not including null
+                                                                                                * term) */
+#define NAME_FIELD_SIZE                                32      /* size of name fields */
+#define MAX_VARCHAR_SIZE                       254 /* maximum size of a varchar (not
                                                                                 * including null term) */
 
 #define PG_NUMERIC_MAX_PRECISION       1000
index c706510fb4e477ac58be7ba36a6ad43e3ccaab28..f9e98eb60fe893d553ccf43da60533bbdeff0a77 100644 (file)
@@ -25,7 +25,7 @@
 #define closesocket(xxx) close(xxx)
 #define SOCKETFD int
 
-#ifndef                  INADDR_NONE
+#ifndef INADDR_NONE
 #ifndef _IN_ADDR_T
 #define _IN_ADDR_T
 typedef unsigned int in_addr_t;
@@ -42,15 +42,15 @@ typedef unsigned int in_addr_t;
 #include "psqlodbc.h"
 
 #define SOCKET_ALREADY_CONNECTED               1
-#define SOCKET_HOST_NOT_FOUND                  2
-#define SOCKET_COULD_NOT_CREATE_SOCKET         3
-#define SOCKET_COULD_NOT_CONNECT               4
-#define SOCKET_READ_ERROR                              5
-#define SOCKET_WRITE_ERROR                             6
-#define SOCKET_NULLPOINTER_PARAMETER   7
-#define SOCKET_PUT_INT_WRONG_LENGTH    8
-#define SOCKET_GET_INT_WRONG_LENGTH    9
-#define SOCKET_CLOSED                                  10
+#define SOCKET_HOST_NOT_FOUND                  2
+#define SOCKET_COULD_NOT_CREATE_SOCKET 3
+#define SOCKET_COULD_NOT_CONNECT               4
+#define SOCKET_READ_ERROR                              5
+#define SOCKET_WRITE_ERROR                             6
+#define SOCKET_NULLPOINTER_PARAMETER   7
+#define SOCKET_PUT_INT_WRONG_LENGTH            8
+#define SOCKET_GET_INT_WRONG_LENGTH            9
+#define SOCKET_CLOSED                                  10
 
 
 struct SocketClass_
index a9359c5925ec786e82b8e336199adedb08110520..3ef91e5d77a5902aa3c593c4d471b054500ba4d9 100644 (file)
@@ -50,38 +50,38 @@ typedef enum
        STMT_EXECUTING                          /* statement execution is still going on */
 } STMT_Status;
 
-#define STMT_TRUNCATED         (-2)
-#define STMT_INFO_ONLY         (-1)    /* not an error message, just a
+#define STMT_TRUNCATED (-2)
+#define STMT_INFO_ONLY (-1)    /* not an error message, just a
                                                                 * notification to be returned by SQLError */
-#define STMT_OK                0               /* will be interpreted as "no error
+#define STMT_OK                        0               /* will be interpreted as "no error
                                                                 * pending" */
-#define STMT_EXEC_ERROR                                1
-#define STMT_STATUS_ERROR                              2
-#define STMT_SEQUENCE_ERROR                    3
-#define STMT_NO_MEMORY_ERROR                   4
-#define STMT_COLNUM_ERROR                              5
-#define STMT_NO_STMTSTRING                             6
-#define STMT_ERROR_TAKEN_FROM_BACKEND  7
-#define STMT_INTERNAL_ERROR                    8
-#define STMT_STILL_EXECUTING                   9
-#define STMT_NOT_IMPLEMENTED_ERROR             10
-#define STMT_BAD_PARAMETER_NUMBER_ERROR 11
-#define STMT_OPTION_OUT_OF_RANGE_ERROR         12
-#define STMT_INVALID_COLUMN_NUMBER_ERROR 13
-#define STMT_RESTRICTED_DATA_TYPE_ERROR 14
-#define STMT_INVALID_CURSOR_STATE_ERROR 15
-#define STMT_OPTION_VALUE_CHANGED              16
-#define STMT_CREATE_TABLE_ERROR                17
-#define STMT_NO_CURSOR_NAME                    18
-#define STMT_INVALID_CURSOR_NAME               19
-#define STMT_INVALID_ARGUMENT_NO               20
-#define STMT_ROW_OUT_OF_RANGE                  21
-#define STMT_OPERATION_CANCELLED               22
-#define STMT_INVALID_CURSOR_POSITION   23
-#define STMT_VALUE_OUT_OF_RANGE                24
-#define STMT_OPERATION_INVALID                         25
-#define STMT_PROGRAM_TYPE_OUT_OF_RANGE         26
-#define STMT_BAD_ERROR                                         27
+#define STMT_EXEC_ERROR                                                1
+#define STMT_STATUS_ERROR                                      2
+#define STMT_SEQUENCE_ERROR                                    3
+#define STMT_NO_MEMORY_ERROR                           4
+#define STMT_COLNUM_ERROR                                      5
+#define STMT_NO_STMTSTRING                                     6
+#define STMT_ERROR_TAKEN_FROM_BACKEND          7
+#define STMT_INTERNAL_ERROR                                    8
+#define STMT_STILL_EXECUTING                           9
+#define STMT_NOT_IMPLEMENTED_ERROR                     10
+#define STMT_BAD_PARAMETER_NUMBER_ERROR                11
+#define STMT_OPTION_OUT_OF_RANGE_ERROR         12
+#define STMT_INVALID_COLUMN_NUMBER_ERROR       13
+#define STMT_RESTRICTED_DATA_TYPE_ERROR                14
+#define STMT_INVALID_CURSOR_STATE_ERROR                15
+#define STMT_OPTION_VALUE_CHANGED                      16
+#define STMT_CREATE_TABLE_ERROR                                17
+#define STMT_NO_CURSOR_NAME                                    18
+#define STMT_INVALID_CURSOR_NAME                       19
+#define STMT_INVALID_ARGUMENT_NO                       20
+#define STMT_ROW_OUT_OF_RANGE                          21
+#define STMT_OPERATION_CANCELLED                       22
+#define STMT_INVALID_CURSOR_POSITION           23
+#define STMT_VALUE_OUT_OF_RANGE                                24
+#define STMT_OPERATION_INVALID                         25
+#define STMT_PROGRAM_TYPE_OUT_OF_RANGE         26
+#define STMT_BAD_ERROR                                         27
 
 /* statement types */
 enum