diff options
| author | Bruce Momjian <bruce@momjian.us> | 2010-02-26 17:07:55 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2010-02-26 17:07:55 +0000 |
| commit | 2cc6ff45f8813593e7c8c0757cd13a7b63a41768 (patch) | |
| tree | a36836570636a1aab4d8186db5f03fce4f28a0db /src/interfaces | |
| parent | 98c356c8ad8b37cbf18932800a73e57d2533bba6 (diff) | |
| download | postgresql-2cc6ff45f8813593e7c8c0757cd13a7b63a41768.tar.gz postgresql-2cc6ff45f8813593e7c8c0757cd13a7b63a41768.zip | |
Revert pgindent changes to ecpg include files that are part of ecpg
regession test output, and update pgindent script to avoid them in the
future.
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/ecpg/include/sqlda.h | 12 | ||||
| -rw-r--r-- | src/interfaces/ecpg/include/sqltypes.h | 36 | ||||
| -rw-r--r-- | src/interfaces/ecpg/test/preproc/struct.h | 26 |
3 files changed, 37 insertions, 37 deletions
diff --git a/src/interfaces/ecpg/include/sqlda.h b/src/interfaces/ecpg/include/sqlda.h index 3f99a463b5d..b1b4debf905 100644 --- a/src/interfaces/ecpg/include/sqlda.h +++ b/src/interfaces/ecpg/include/sqlda.h @@ -4,13 +4,15 @@ #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 797cb5b1be4..0c01867d02f 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 */ diff --git a/src/interfaces/ecpg/test/preproc/struct.h b/src/interfaces/ecpg/test/preproc/struct.h index 75e802ac6fe..cc4681b74fe 100644 --- a/src/interfaces/ecpg/test/preproc/struct.h +++ b/src/interfaces/ecpg/test/preproc/struct.h @@ -1,20 +1,18 @@ -struct mytype -{ - int id; - char t[64]; - double d1; /* dec_t */ - double d2; - char c[30]; +struct mytype { + int id; + char t[64]; + double d1; /* dec_t */ + double d2; + char c[30]; }; typedef struct mytype MYTYPE; -struct mynulltype -{ - int id; - int t; - int d1; - int d2; - int c; +struct mynulltype { + int id; + int t; + int d1; + int d2; + int c; }; typedef struct mynulltype MYNULLTYPE; |