From 4315ba43d70540368fec5b44da82a000ab300de4 Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Sun, 13 Jan 2008 11:53:16 +0000 Subject: [PATCH] Changed prototype for ECPGdo because some compilers don't like int/enum aliasing in there. --- src/interfaces/ecpg/ChangeLog | 5 +++++ src/interfaces/ecpg/ecpglib/execute.c | 4 ++-- src/interfaces/ecpg/include/ecpglib.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog index 8876c56643..73327a7bc2 100644 --- 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 a4a21c0d5a..d5504fb5e3 100644 --- a/src/interfaces/ecpg/ecpglib/execute.c +++ b/src/interfaces/ecpg/ecpglib/execute.c @@ -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 3fd9a3ec33..684348e71c 100644 --- a/src/interfaces/ecpg/include/ecpglib.h +++ b/src/interfaces/ecpg/include/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 *); -- 2.39.5