From 7e684fad02d8943ba5d741f35f883d01021522c7 Mon Sep 17 00:00:00 2001
From: Michael Meskes <meskes@postgresql.org>
Date: Fri, 16 May 2003 09:42:56 +0000
Subject: [PATCH] Fixed incorrect include and another typo. Sorry, the include
 did not create a warning/error/problem on my machine, so I didn't notice it.

---
 src/interfaces/ecpg/ChangeLog            | 4 ++++
 src/interfaces/ecpg/pgtypeslib/numeric.c | 2 +-
 src/interfaces/ecpg/preproc/type.c       | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index bb9e2ecf24f..d07c9367604 100644
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -1414,6 +1414,10 @@ Wed May 14 13:05:49 CEST 2003
 	- Added more compatibility functions.
 	- Accept CPP defines for type definitions.
 	- Do not parse system include files automatically for Informix mode
+
+Fri May 16 11:45:50 CEST 2003
+
+	- Fixed include in pgtypeslib to not include c.h
 	- Set ecpg version to 2.12.0.
 	- Set ecpg library to 3.4.2.
 	- Set pgtypes library to 1.0.0
diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
index 8988df06dfe..f2bb5be5dfc 100644
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -6,7 +6,7 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "c.h"
+#include "postgres_fe.h"
 #include "extern.h"
 #include "pgtypes_error.h"
 
diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c
index 365a92f48a6..d81c9f1374e 100644
--- a/src/interfaces/ecpg/preproc/type.c
+++ b/src/interfaces/ecpg/preproc/type.c
@@ -314,7 +314,7 @@ ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type,
 				 * bounds
 				 */
 				if (((atoi(arrsize) > 0) || 
-				     (atoi(arrsize) == 0) && strcmp(arrsize, "0") != 0) &&
+				     (atoi(arrsize) == 0 && strcmp(arrsize, "0") != 0)) &&
 				      siz == NULL)
 					sprintf(variable, "(%s%s)", prefix ? prefix : "", name);
 				else
@@ -380,7 +380,7 @@ ECPGdump_a_simple(FILE *o, const char *name, enum ECPGttype type,
 				 * bounds
 				 */
 				if (((atoi(arrsize) > 0) || 
-				     (atoi(arrsize) == 0) && strcmp(arrsize, "0") != 0) &&
+				     (atoi(arrsize) == 0 && strcmp(arrsize, "0") != 0)) &&
 				      siz == NULL)
 					sprintf(variable, "(%s%s)", prefix ? prefix : "", name);
 				else
-- 
GitLab