Commit 9c891acd authored by Bruce Momjian's avatar Bruce Momjian

Include file alignment fixes.

parent cc818a83
...@@ -47,9 +47,9 @@ ...@@ -47,9 +47,9 @@
#define INI_DSN DBMS_NAME /* Name of default Datasource in #define INI_DSN DBMS_NAME /* Name of default Datasource in
* ini file (not used?) */ * ini file (not used?) */
#define INI_KDESC "Description" /* Data source description */ #define INI_KDESC "Description" /* Data source description */
#define INI_SERVER "Servername" /* Name of Server running the #define INI_SERVER "Servername" /* Name of Server running
* Postgres service */ * the Postgres service */
#define INI_PORT "Port"/* Port on which the Postmaster is #define INI_PORT "Port" /* Port on which the Postmaster is
* listening */ * listening */
#define INI_DATABASE "Database" /* Database Name */ #define INI_DATABASE "Database" /* Database Name */
#define INI_USER "Username" /* Default User Name */ #define INI_USER "Username" /* Default User Name */
...@@ -62,11 +62,12 @@ ...@@ -62,11 +62,12 @@
* logging */ * logging */
#define INI_PROTOCOL "Protocol" /* What protocol (6.2) */ #define INI_PROTOCOL "Protocol" /* What protocol (6.2) */
#define INI_OPTIMIZER "Optimizer" /* Use backend genetic optimizer */ #define INI_OPTIMIZER "Optimizer" /* Use backend genetic optimizer */
#define INI_KSQO "Ksqo"/* Keyset query optimization */ #define INI_KSQO "Ksqo" /* Keyset query optimization */
#define INI_CONNSETTINGS "ConnSettings" /* Anything to send to #define INI_CONNSETTINGS "ConnSettings" /* Anything to send to
* backend on successful * backend on successful
* connection */ * connection */
#define INI_UNIQUEINDEX "UniqueIndex" /* Recognize unique indexes */ #define INI_UNIQUEINDEX "UniqueIndex" /* Recognize unique
* indexes */
#define INI_UNKNOWNSIZES "UnknownSizes" /* How to handle unknown #define INI_UNKNOWNSIZES "UnknownSizes" /* How to handle unknown
* result set sizes */ * result set sizes */
......
...@@ -17,7 +17,7 @@ extern "C" ...@@ -17,7 +17,7 @@ extern "C"
{ {
#endif #endif
DWORD GetPrivateProfileString(char *theSection, /* section name */ DWORD GetPrivateProfileString(char *theSection, /* section name */
char *theKey, /* search key name */ char *theKey, /* search key name */
char *theDefault, /* default value if not char *theDefault, /* default value if not
* found */ * found */
...@@ -28,7 +28,7 @@ DWORD GetPrivateProfileString(char *theSection, /* section name */ ...@@ -28,7 +28,7 @@ DWORD GetPrivateProfileString(char *theSection, /* section name */
char *theIniFileName); /* pathname of ini file char *theIniFileName); /* pathname of ini file
* to search */ * to search */
DWORD WritePrivateProfileString(char *theSection, /* section name */ DWORD WritePrivateProfileString(char *theSection, /* section name */
char *theKey, /* write key name */ char *theKey, /* write key name */
char *theBuffer, /* input buffer */ char *theBuffer, /* input buffer */
char *theIniFileName); /* pathname of ini file char *theIniFileName); /* pathname of ini file
......
...@@ -133,11 +133,9 @@ extern "C" ...@@ -133,11 +133,9 @@ extern "C"
{ {
#endif #endif
RETCODE SQL_API SQLAllocConnect(HENV henv, RETCODE SQL_API SQLAllocConnect(HENV henv, HDBC FAR *phdbc);
HDBC FAR *phdbc);
RETCODE SQL_API SQLAllocEnv(HENV FAR *phenv); RETCODE SQL_API SQLAllocEnv(HENV FAR *phenv);
RETCODE SQL_API SQLAllocStmt(HDBC hdbc, RETCODE SQL_API SQLAllocStmt(HDBC hdbc, HSTMT FAR *phstmt);
HSTMT FAR *phstmt);
RETCODE SQL_API SQLBindCol(HSTMT hstmt, RETCODE SQL_API SQLBindCol(HSTMT hstmt,
UWORD icol, UWORD icol,
SWORD fCType, SWORD fCType,
...@@ -217,7 +215,8 @@ extern "C" ...@@ -217,7 +215,8 @@ extern "C"
RETCODE SQL_API SQLTransact(HENV henv, HDBC hdbc, RETCODE SQL_API SQLTransact(HENV henv, HDBC hdbc,
UWORD fType); UWORD fType);
RETCODE SQL_API SQLSetParam(HSTMT hstmt, UWORD ipar, RETCODE SQL_API SQLSetParam(HSTMT hstmt,
UWORD ipar,
SWORD fCType, SWORD fCType,
SWORD fSqlType, SWORD fSqlType,
UDWORD cbColDef, UDWORD cbColDef,
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* *
* Comments: See "notice.txt" for copyright and license information. * 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__ #ifndef __PSQLODBC_H__
...@@ -55,16 +55,15 @@ typedef UInt4 Oid; ...@@ -55,16 +55,15 @@ typedef UInt4 Oid;
#define BLCKSZ 4096 #define BLCKSZ 4096
#endif #endif
#define MAX_MESSAGE_LEN 65536 /* This puts a limit on #define MAX_MESSAGE_LEN 65536 /* This puts a limit on query size
* query size but I don't */ * but I don't */
/* see an easy way round this - DJP 24-1-2001 */ /* see an easy way round this - DJP 24-1-2001 */
#define MAX_CONNECT_STRING 4096 #define MAX_CONNECT_STRING 4096
#define ERROR_MSG_LENGTH 4096 #define ERROR_MSG_LENGTH 4096
#define FETCH_MAX 100 /* default number of rows to cache #define FETCH_MAX 100 /* default number of rows to cache
* for declare/fetch */ * for declare/fetch */
#define TUPLE_MALLOC_INC 100 #define TUPLE_MALLOC_INC 100
#define SOCK_BUFFER_SIZE 4096 /* default socket buffer #define SOCK_BUFFER_SIZE 4096 /* default socket buffer size */
* size */
#define MAX_CONNECTIONS 128 /* conns per environment #define MAX_CONNECTIONS 128 /* conns per environment
* (arbitrary) */ * (arbitrary) */
#define MAX_FIELDS 512 #define MAX_FIELDS 512
...@@ -91,9 +90,10 @@ typedef UInt4 Oid; ...@@ -91,9 +90,10 @@ typedef UInt4 Oid;
#define MAX_KEYPARTS 20 #define MAX_KEYPARTS 20
#define MAX_KEYLEN 512 /* max key of the form #define MAX_KEYLEN 512 /* max key of the form
* "date+outlet+invoice" */ * "date+outlet+invoice" */
#define MAX_ROW_SIZE 0 /* Unlimited rowsize with the Tuple #define MAX_ROW_SIZE 0 /* Unlimited rowsize with the
* Toaster */ * Tuple Toaster */
#define MAX_STATEMENT_LEN 0 /* Unlimited statement size with 7.0 */ #define MAX_STATEMENT_LEN 0 /* Unlimited statement size with
* 7.0 */
/* Previously, numerous query strings were defined of length MAX_STATEMENT_LEN */ /* Previously, numerous query strings were defined of length MAX_STATEMENT_LEN */
/* Now that's 0, lets use this instead. DJP 24-1-2001 */ /* Now that's 0, lets use this instead. DJP 24-1-2001 */
...@@ -172,15 +172,16 @@ typedef struct QueryInfo_ ...@@ -172,15 +172,16 @@ typedef struct QueryInfo_
} QueryInfo; } QueryInfo;
#define PG_TYPE_LO -999 /* hack until permanent type #define PG_TYPE_LO -999 /* hack until permanent
* available */ * type available */
#define PG_TYPE_LO_NAME "lo" #define PG_TYPE_LO_NAME "lo"
#define OID_ATTNUM -2 /* the attnum in pg_index of the #define OID_ATTNUM -2 /* the attnum in pg_index of the
* oid */ * oid */
/* sizes */ /* sizes */
#define TEXT_FIELD_SIZE 8190 /* size of text fields (not #define TEXT_FIELD_SIZE 8190 /* size of text fields
* including null term) */ * (not including null
* term) */
#define NAME_FIELD_SIZE 32 /* size of name fields */ #define NAME_FIELD_SIZE 32 /* size of name fields */
#define MAX_VARCHAR_SIZE 254 /* maximum size of a varchar (not #define MAX_VARCHAR_SIZE 254 /* maximum size of a varchar (not
* including null term) */ * including null term) */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment