aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Conway <neilc@samurai.com>2006-01-15 22:46:53 +0000
committerNeil Conway <neilc@samurai.com>2006-01-15 22:46:53 +0000
commit1ce4c9e9b4375886fb00f1c039617215f214d9f2 (patch)
treec2d131a67d0c99fe9c27439d84e97b54a39be4b9
parent4dcc82ac7e255c403d5744204534f9338133bcc1 (diff)
downloadpostgresql-1ce4c9e9b4375886fb00f1c039617215f214d9f2.tar.gz
postgresql-1ce4c9e9b4375886fb00f1c039617215f214d9f2.zip
When using GCC on AMD64 and PPC, ECPGget_variable() takes a va_list *, not
a va_list. Christof Petig's previous patch made this change, but neglected to update ecpglib/descriptor.c, resulting in a compiler warning (and a likely runtime crash) on AMD64 and PPC.
-rw-r--r--src/interfaces/ecpg/ecpglib/descriptor.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
index 5985595c793..ff47cd13258 100644
--- a/src/interfaces/ecpg/ecpglib/descriptor.c
+++ b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -1,6 +1,6 @@
/* dynamic SQL support routines
*
- * $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.13 2005/11/30 12:49:49 meskes Exp $
+ * $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/descriptor.c,v 1.14 2006/01/15 22:46:53 neilc Exp $
*/
#define POSTGRES_ECPG_INTERNAL
@@ -503,7 +503,11 @@ ECPGset_desc(int lineno, const char *desc_name, int index,...)
break;
type = va_arg(args, enum ECPGttype);
+#if defined(__GNUC__) && (defined (__powerpc__) || defined(__amd64__) || defined(__x86_64__))
+ ECPGget_variable(args, type, var, false);
+#else
ECPGget_variable(&args, type, var, false);
+#endif
switch (itemtype)
{