Include file alignment fixes.

src/interfaces/odbc/columninfo.h

@@ -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

src/interfaces/odbc/connection.h

@@ -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 */

src/interfaces/odbc/dlg_specific.h

@@ -31,46 +31,47 @@
 
 /* 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 */

src/interfaces/odbc/gpps.h

@@ -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
 }

src/interfaces/odbc/iodbc.h

@@ -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

src/interfaces/odbc/isql.h

@@ -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,

src/interfaces/odbc/misc.h

@@ -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
 
 

src/interfaces/odbc/pgtypes.h

@@ -55,13 +55,13 @@
 #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[];

src/interfaces/odbc/psqlodbc.h

@@ -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

src/interfaces/odbc/socket.h

@@ -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_

src/interfaces/odbc/statement.h

@@ -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