diff options
Diffstat (limited to 'src/interfaces/ecpg/include')
| -rw-r--r-- | src/interfaces/ecpg/include/ecpg_informix.h | 6 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/ecpglib.h | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/ecpgtype.h | 4 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/pgtypes_interval.h | 3 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/sqlda-compat.h | 54 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/sqlda-native.h | 8 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/sqlda.h | 12 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/sqltypes.h | 36 |
8 files changed, 62 insertions, 65 deletions
diff --git a/src/interfaces/ecpg/include/ecpg_informix.h b/src/interfaces/ecpg/include/ecpg_informix.h index a97246b1937..3be8ebba9c7 100644 --- a/src/interfaces/ecpg/include/ecpg_informix.h +++ b/src/interfaces/ecpg/include/ecpg_informix.h @@ -1,6 +1,6 @@ /* * This file contains stuff needed to be as compatible to Informix as possible. - * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg_informix.h,v 1.23 2009/08/14 13:28:22 meskes Exp $ + * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpg_informix.h,v 1.24 2010/02/26 02:01:31 momjian Exp $ */ #ifndef _ECPG_INFORMIX_H #define _ECPG_INFORMIX_H @@ -34,7 +34,7 @@ extern "C" #endif extern int rdatestr(date, char *); -extern void rtoday(date *); +extern void rtoday(date *); extern int rjulmdy(date, short *); extern int rdefmtdate(date *, char *, char *); extern int rfmtdate(date, char *, char *); @@ -49,7 +49,7 @@ extern int rsetnull(int, char *); extern int rtypalign(int, int); extern int rtypmsize(int, int); extern int rtypwidth(int, int); -extern void rupshift(char *); +extern void rupshift(char *); extern int byleng(char *, int); extern void ldchar(char *, int, char *); diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h index 775fe7a6e25..2e1f1d6e246 100644 --- a/src/interfaces/ecpg/include/ecpglib.h +++ b/src/interfaces/ecpg/include/ecpglib.h @@ -1,7 +1,7 @@ /* * this is a small part of c.h since we don't want to leak all postgres * definitions into ecpg programs - * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.82 2010/01/26 09:07:31 meskes Exp $ + * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.83 2010/02/26 02:01:31 momjian Exp $ */ #ifndef _ECPGLIB_H @@ -83,7 +83,7 @@ bool ECPGset_desc(int, const char *, int,...); void ECPGset_noind_null(enum ECPGttype, void *); bool ECPGis_noind_null(enum ECPGttype, void *); -bool ECPGdescribe(int, int, bool, const char *, const char *, ...); +bool ECPGdescribe(int, int, bool, const char *, const char *,...); void ECPGset_var(int, void *, int); void *ECPGget_var(int number); diff --git a/src/interfaces/ecpg/include/ecpgtype.h b/src/interfaces/ecpg/include/ecpgtype.h index bd73badd0ff..12bfd135ba7 100644 --- a/src/interfaces/ecpg/include/ecpgtype.h +++ b/src/interfaces/ecpg/include/ecpgtype.h @@ -5,7 +5,7 @@ * All types that can be handled for host variable declarations has to * be handled eventually. * - * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpgtype.h,v 1.39 2010/01/05 16:38:23 meskes Exp $ + * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpgtype.h,v 1.40 2010/02/26 02:01:31 momjian Exp $ */ /* @@ -63,7 +63,7 @@ enum ECPGttype ECPGt_EORT, /* End of result types. */ ECPGt_NO_INDICATOR, /* no indicator */ ECPGt_string, /* trimmed (char *) type */ - ECPGt_sqlda /* C struct descriptor */ + ECPGt_sqlda /* C struct descriptor */ }; /* descriptor items */ diff --git a/src/interfaces/ecpg/include/pgtypes_interval.h b/src/interfaces/ecpg/include/pgtypes_interval.h index 0d6ab38603f..6f2225c03a1 100644 --- a/src/interfaces/ecpg/include/pgtypes_interval.h +++ b/src/interfaces/ecpg/include/pgtypes_interval.h @@ -1,4 +1,4 @@ -/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/pgtypes_interval.h,v 1.15 2010/01/07 04:53:35 tgl Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/include/pgtypes_interval.h,v 1.16 2010/02/26 02:01:31 momjian Exp $ */ #ifndef PGTYPES_INTERVAL #define PGTYPES_INTERVAL @@ -23,7 +23,6 @@ typedef long long int int64; #ifdef USE_INTEGER_DATETIMES #define HAVE_INT64_TIMESTAMP #endif - #endif /* C_H */ typedef struct diff --git a/src/interfaces/ecpg/include/sqlda-compat.h b/src/interfaces/ecpg/include/sqlda-compat.h index e4f56aaadd8..2c4e07c5f1b 100644 --- a/src/interfaces/ecpg/include/sqlda-compat.h +++ b/src/interfaces/ecpg/include/sqlda-compat.h @@ -7,41 +7,41 @@ struct sqlvar_compat { - short sqltype; /* variable type */ - int sqllen; /* length in bytes */ - char *sqldata; /* pointer to data */ - short *sqlind; /* pointer to indicator */ - char *sqlname; /* variable name */ - char *sqlformat; /* reserved for future use */ - short sqlitype; /* ind variable type */ - short sqlilen; /* ind length in bytes */ - char *sqlidata; /* ind data pointer */ - int sqlxid; /* extended id type */ - char *sqltypename; /* extended type name */ - short sqltypelen; /* length of extended type name */ - short sqlownerlen; /* length of owner name */ - short sqlsourcetype; /* source type for distinct of built-ins */ - char *sqlownername; /* owner name */ - int sqlsourceid; /* extended id of source type */ + short sqltype; /* variable type */ + int sqllen; /* length in bytes */ + char *sqldata; /* pointer to data */ + short *sqlind; /* pointer to indicator */ + char *sqlname; /* variable name */ + char *sqlformat; /* reserved for future use */ + short sqlitype; /* ind variable type */ + short sqlilen; /* ind length in bytes */ + char *sqlidata; /* ind data pointer */ + int sqlxid; /* extended id type */ + char *sqltypename; /* extended type name */ + short sqltypelen; /* length of extended type name */ + short sqlownerlen; /* length of owner name */ + short sqlsourcetype; /* source type for distinct of built-ins */ + char *sqlownername; /* owner name */ + int sqlsourceid; /* extended id of source type */ /* - * sqlilongdata is new. It supports data that exceeds the 32k - * limit. sqlilen and sqlidata are for backward compatibility - * and they have maximum value of <32K. + * sqlilongdata is new. It supports data that exceeds the 32k limit. + * sqlilen and sqlidata are for backward compatibility and they have + * maximum value of <32K. */ - char *sqlilongdata; /* for data field beyond 32K */ - int sqlflags; /* for internal use only */ - void *sqlreserved; /* reserved for future use */ + char *sqlilongdata; /* for data field beyond 32K */ + int sqlflags; /* for internal use only */ + void *sqlreserved; /* reserved for future use */ }; struct sqlda_compat { short sqld; struct sqlvar_compat *sqlvar; - char desc_name[19]; /* descriptor name */ - short desc_occ; /* size of sqlda structure */ - struct sqlda_compat *desc_next; /* pointer to next sqlda struct */ - void *reserved; /* reserved for future use */ + char desc_name[19]; /* descriptor name */ + short desc_occ; /* size of sqlda structure */ + struct sqlda_compat *desc_next; /* pointer to next sqlda struct */ + void *reserved; /* reserved for future use */ }; -#endif /* ECPG_SQLDA_COMPAT_H */ +#endif /* ECPG_SQLDA_COMPAT_H */ diff --git a/src/interfaces/ecpg/include/sqlda-native.h b/src/interfaces/ecpg/include/sqlda-native.h index d8a6669ef40..bd870764ead 100644 --- a/src/interfaces/ecpg/include/sqlda-native.h +++ b/src/interfaces/ecpg/include/sqlda-native.h @@ -1,5 +1,5 @@ /* - * $PostgreSQL: pgsql/src/interfaces/ecpg/include/sqlda-native.h,v 1.2 2010/01/06 15:10:21 meskes Exp $ + * $PostgreSQL: pgsql/src/interfaces/ecpg/include/sqlda-native.h,v 1.3 2010/02/26 02:01:31 momjian Exp $ */ #ifndef ECPG_SQLDA_NATIVE_H @@ -11,7 +11,7 @@ * because the length must include a trailing zero byte. * * This should be at least as much as NAMEDATALEN of the database the - * applications run against. + * applications run against. */ #define NAMEDATALEN 64 @@ -37,7 +37,7 @@ struct sqlda_struct short sqln; short sqld; struct sqlda_struct *desc_next; - struct sqlvar_struct sqlvar[1]; + struct sqlvar_struct sqlvar[1]; }; -#endif /* ECPG_SQLDA_NATIVE_H */ +#endif /* ECPG_SQLDA_NATIVE_H */ diff --git a/src/interfaces/ecpg/include/sqlda.h b/src/interfaces/ecpg/include/sqlda.h index b1b4debf905..3f99a463b5d 100644 --- a/src/interfaces/ecpg/include/sqlda.h +++ b/src/interfaces/ecpg/include/sqlda.h @@ -4,15 +4,13 @@ #ifdef _ECPG_INFORMIX_H #include "sqlda-compat.h" -typedef struct sqlvar_compat sqlvar_t; -typedef struct sqlda_compat sqlda_t; - +typedef struct sqlvar_compat sqlvar_t; +typedef struct sqlda_compat sqlda_t; #else #include "sqlda-native.h" -typedef struct sqlvar_struct sqlvar_t; -typedef struct sqlda_struct sqlda_t; - +typedef struct sqlvar_struct sqlvar_t; +typedef struct sqlda_struct sqlda_t; #endif -#endif /* ECPG_SQLDA_H */ +#endif /* ECPG_SQLDA_H */ diff --git a/src/interfaces/ecpg/include/sqltypes.h b/src/interfaces/ecpg/include/sqltypes.h index 0c01867d02f..797cb5b1be4 100644 --- a/src/interfaces/ecpg/include/sqltypes.h +++ b/src/interfaces/ecpg/include/sqltypes.h @@ -32,26 +32,26 @@ /* * Values used in sqlda->sqlvar[i]->sqltype */ -#define SQLCHAR ECPGt_char -#define SQLSMINT ECPGt_short -#define SQLINT ECPGt_int -#define SQLFLOAT ECPGt_double -#define SQLSMFLOAT ECPGt_float -#define SQLDECIMAL ECPGt_decimal -#define SQLSERIAL ECPGt_int -#define SQLDATE ECPGt_date -#define SQLDTIME ECPGt_timestamp -#define SQLTEXT ECPGt_char -#define SQLVCHAR ECPGt_char -#define SQLINTERVAL ECPGt_interval -#define SQLNCHAR ECPGt_char -#define SQLNVCHAR ECPGt_char +#define SQLCHAR ECPGt_char +#define SQLSMINT ECPGt_short +#define SQLINT ECPGt_int +#define SQLFLOAT ECPGt_double +#define SQLSMFLOAT ECPGt_float +#define SQLDECIMAL ECPGt_decimal +#define SQLSERIAL ECPGt_int +#define SQLDATE ECPGt_date +#define SQLDTIME ECPGt_timestamp +#define SQLTEXT ECPGt_char +#define SQLVCHAR ECPGt_char +#define SQLINTERVAL ECPGt_interval +#define SQLNCHAR ECPGt_char +#define SQLNVCHAR ECPGt_char #ifdef HAVE_LONG_LONG_INT_64 -#define SQLINT8 ECPGt_long_long -#define SQLSERIAL8 ECPGt_long_long +#define SQLINT8 ECPGt_long_long +#define SQLSERIAL8 ECPGt_long_long #else -#define SQLINT8 ECPGt_long -#define SQLSERIAL8 ECPGt_long +#define SQLINT8 ECPGt_long +#define SQLSERIAL8 ECPGt_long #endif #endif /* ndef ECPG_SQLTYPES_H */ |