From 2cc6ff45f8813593e7c8c0757cd13a7b63a41768 Mon Sep 17 00:00:00 2001
From: Bruce Momjian
Date: Fri, 26 Feb 2010 17:07:55 +0000
Subject: 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.

---
 src/interfaces/ecpg/include/sqlda.h       | 12 ++++++-----
 src/interfaces/ecpg/include/sqltypes.h    | 36 +++++++++++++++----------------
 src/interfaces/ecpg/test/preproc/struct.h | 26 +++++++++++-----------
 3 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'src/interfaces')

diff --git a/src/interfaces/ecpg/include/sqlda.h b/src/interfaces/ecpg/include/sqlda.h
index 3f99a463b5..b1b4debf90 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 797cb5b1be..0c01867d02 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 75e802ac6f..cc4681b74f 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;
-- 
cgit v1.2.3