4 files changed, 52 insertions, 38 deletions
diff --git a/src/interfaces/ecpg/test/expected/preproc-outofscope.c b/src/interfaces/ecpg/test/expected/preproc-outofscope.c
index d510eb0e03b..e8c4f5c0b46 100644
--- a/src/interfaces/ecpg/test/expected/preproc-outofscope.c
+++ b/src/interfaces/ecpg/test/expected/preproc-outofscope.c
@@ -100,61 +100,63 @@ int			PGTYPESnumeric_from_decimal(decimal *, numeric *);
 
 #line 1 "struct.h"
 
-  
-		
-		
-		 /* dec_t */
-		
-		
+ 
+
+				
+			
+							/* dec_t */
+			
+			
 
    typedef struct mytype  MYTYPE ;
 
-#line 9 "struct.h"
+#line 10 "struct.h"
 
 
-  
-		
-		
-		
-		
-		
+ 
+
+				
+				
+				
+				
+				
 
    typedef struct mynulltype  MYNULLTYPE ;
 
-#line 18 "struct.h"
+#line 20 "struct.h"
 
 
 #line 11 "outofscope.pgc"
 
 struct mytype { 
-#line 3 "struct.h"
+#line 4 "struct.h"
  int id ;
  
-#line 4 "struct.h"
+#line 5 "struct.h"
  char t [ 64 ] ;
  
-#line 5 "struct.h"
+#line 6 "struct.h"
  double d1 ;
  
-#line 6 "struct.h"
+#line 7 "struct.h"
  double d2 ;
  
-#line 7 "struct.h"
+#line 8 "struct.h"
  char c [ 30 ] ;
  } ; struct mynulltype { 
-#line 12 "struct.h"
+#line 14 "struct.h"
  int id ;
  
-#line 13 "struct.h"
+#line 15 "struct.h"
  int t ;
  
-#line 14 "struct.h"
+#line 16 "struct.h"
  int d1 ;
  
-#line 15 "struct.h"
+#line 17 "struct.h"
  int d2 ;
  
-#line 16 "struct.h"
+#line 18 "struct.h"
  int c ;
  } ;/* exec sql end declare section */
 #line 12 "outofscope.pgc"
diff --git a/src/interfaces/ecpg/test/expected/preproc-strings.c b/src/interfaces/ecpg/test/expected/preproc-strings.c
index dd13cf36cf0..310dbb837ea 100644
--- a/src/interfaces/ecpg/test/expected/preproc-strings.c
+++ b/src/interfaces/ecpg/test/expected/preproc-strings.c
@@ -18,7 +18,12 @@
 #line 3 "strings.pgc"
 /* exec sql begin declare section */
 #line 1 "strings.h"
-      
+	   
+		   
+		   
+		   
+		   
+		   
 
 #line 5 "strings.pgc"
 
diff --git a/src/interfaces/ecpg/test/preproc/strings.h b/src/interfaces/ecpg/test/preproc/strings.h
index 4779af9881d..07c04f91039 100644
--- a/src/interfaces/ecpg/test/preproc/strings.h
+++ b/src/interfaces/ecpg/test/preproc/strings.h
@@ -1 +1,6 @@
-char *s1, *s2, *s3, *s4, *s5, *s6;
+char	   *s1,
+		   *s2,
+		   *s3,
+		   *s4,
+		   *s5,
+		   *s6;
diff --git a/src/interfaces/ecpg/test/preproc/struct.h b/src/interfaces/ecpg/test/preproc/struct.h
index cc4681b74fe..75e802ac6fe 100644
--- a/src/interfaces/ecpg/test/preproc/struct.h
+++ b/src/interfaces/ecpg/test/preproc/struct.h
@@ -1,18 +1,20 @@
 
-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;