Changed prototype for ECPGdo because some compilers don't like int/enum aliasing...

diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
index 8876c56643083f9ca5346745a4bfd5e88744914d..73327a7bc2df472dc4af23a821a10545d576868d 100644 (file)
--- a/src/interfaces/ecpg/ChangeLog
+++ b/src/interfaces/ecpg/ChangeLog
@@ -2283,6 +2283,11 @@ Fri, 28 Dec 2007 12:15:38 +0100
 Fri, 11 Jan 2008 16:16:24 +0100
 
    - Fixed lexer to correctly parse C quotes.
+
+Sun, 13 Jan 2008 12:52:15 +0100
+
+   - Changed prototype for ECPGdo because some compilers don't like
+     int/enum aliasing in there.
    - Set pgtypes library version to 3.0.
    - Set compat library version to 3.0.
    - Set ecpg library version to 6.0.

diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 689421a9c0aa9f25d284a5a05f1b685889720123..1b1f47217b2c8a65e457ec697ef98f2ef5c322da 100644 (file)
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.73 2007/11/15 21:14:45 momjian Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.74 2008/01/13 11:53:16 meskes Exp $ */
 
 /*
  * The aim is to get a simpler inteface to the database routines.
@@ -1430,7 +1430,7 @@ ecpg_execute(struct statement * stmt)
 }
 
 bool
-ECPGdo(const int lineno, const int compat, const int force_indicator, const char *connection_name, const bool questionmarks, const enum ECPG_statement_type st, const char *query,...)
+ECPGdo(const int lineno, const int compat, const int force_indicator, const char *connection_name, const bool questionmarks, const int st, const char *query,...)
 {
    va_list     args;
    struct statement *stmt;
@@ -1439,7 +1439,7 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char
    char       *oldlocale;
    enum ECPGttype type;
    struct variable **list;
-   enum ECPG_statement_type statement_type = st;
+   enum ECPG_statement_type statement_type = (enum ECPG_statement_type) st;
    char       *prepname;
 
    if (!query)

diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h
index ac7cd4f19e6d12aaf989d42f56cc39ba321dee87..18cab5029e9efc02d5c07e78a4e597fc971d6831 100644 (file)
--- a/src/interfaces/ecpg/include/ecpglib.h
+++ b/src/interfaces/ecpg/include/ecpglib.h
@@ -1,7 +1,7 @@
 /*
  * this is a small part of c.h since we don't want to leak all postgres
  * definitions into ecpg programs
- * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.73 2007/10/03 11:11:12 meskes Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/include/ecpglib.h,v 1.74 2008/01/13 11:53:16 meskes Exp $
  */
 
 #ifndef _ECPGLIB_H
@@ -43,7 +43,7 @@ bool      ECPGstatus(int, const char *);
 bool       ECPGsetcommit(int, const char *, const char *);
 bool       ECPGsetconn(int, const char *);
 bool       ECPGconnect(int, int, const char *, const char *, const char *, const char *, int);
-bool       ECPGdo(const int, const int, const int, const char *, const char, const enum ECPG_statement_type, const char *,...);
+bool       ECPGdo(const int, const int, const int, const char *, const bool, const int, const char *,...);
 bool       ECPGtrans(int, const char *, const char *);
 bool       ECPGdisconnect(int, const char *);
 bool       ECPGprepare(int, const char *, const int, const char *, const char *);