database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

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

Browse Source
This commit is contained in:
Michael Meskes 2008-01-13 11:53:16 +00:00
parent 9f2a20b66d
commit 149db6b6b7
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/interfaces/ecpg/ChangeLog
View File

@ -2283,6 +2283,11 @@ Fri, 28 Dec 2007 12:15:38 +0100
Fri, 11 Jan 2008 16:16:24 +0100 Fri, 11 Jan 2008 16:16:24 +0100
- Fixed lexer to correctly parse C quotes. - 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 pgtypes library version to 3.0.
- Set compat library version to 3.0. - Set compat library version to 3.0.
- Set ecpg library version to 6.0. - Set ecpg library version to 6.0.

6
src/interfaces/ecpg/ecpglib/execute.c
View File

@ -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. * The aim is to get a simpler inteface to the database routines.
@ -1430,7 +1430,7 @@ ecpg_execute(struct statement * stmt)
} }
bool 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; va_list args;
struct statement *stmt; struct statement *stmt;
@ -1439,7 +1439,7 @@ ECPGdo(const int lineno, const int compat, const int force_indicator, const char
char *oldlocale; char *oldlocale;
enum ECPGttype type; enum ECPGttype type;
struct variable **list; struct variable **list;
enum ECPG_statement_type statement_type = st; enum ECPG_statement_type statement_type = (enum ECPG_statement_type) st;
char *prepname; char *prepname;
if (!query) if (!query)

4
src/interfaces/ecpg/include/ecpglib.h
View File

@ -1,7 +1,7 @@
/* /*
* this is a small part of c.h since we don't want to leak all postgres * this is a small part of c.h since we don't want to leak all postgres
* definitions into ecpg programs * 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 #ifndef _ECPGLIB_H
@ -43,7 +43,7 @@ bool ECPGstatus(int, const char *);
bool ECPGsetcommit(int, const char *, const char *); bool ECPGsetcommit(int, const char *, const char *);
bool ECPGsetconn(int, const char *); bool ECPGsetconn(int, const char *);
bool ECPGconnect(int, int, const char *, const char *, const char *, const char *, int); 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 ECPGtrans(int, const char *, const char *);
bool ECPGdisconnect(int, const char *); bool ECPGdisconnect(int, const char *);
bool ECPGprepare(int, const char *, const int, const char *, const char *); bool ECPGprepare(int, const char *, const int, const char *, const char *);