Fixed incorrect include and another typo. Sorry, the include did not create a warning...

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index bb9e2ecf24ff6d5b09548e6a50e6f3f49fcbde8e..d07c9367604cc1cf2310bb86359cf78d62060583 100644 (file)
--- 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 8988df06dfe23c9ed56f5757652f8ad8b0a52f77..f2bb5be5dfcf6474772d191a44f6c14eb88df44a 100644 (file)
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -6,7 +6,7 @@
 #include 
 #include 
 
-#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 365a92f48a69e802b1e8c9b34295028bb3dd12c3..d81c9f1374e5c0ca8fc3dbe67267d111502805ef 100644 (file)
--- 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