From 8a794511520b55852ba4184449a0b67f8be6bcbd Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Mon, 4 Jul 2005 19:05:45 +0000 Subject: [PATCH] I have to admit that I got the case of the preprocessor symbol on amd64 wrong. __AMD64__ is not defined, __amd64__ is. Christof Petig --- src/interfaces/ecpg/ecpglib/execute.c | 6 +++--- src/interfaces/ecpg/ecpglib/extern.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c index e1e8a43f4f..f8e32530d7 100644 --- 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.41 2005/07/02 17:01:53 momjian Exp $ */ +/* $PostgreSQL: pgsql/src/interfaces/ecpg/ecpglib/execute.c,v 1.42 2005/07/04 19:05:45 momjian Exp $ */ /* * The aim is to get a simpler inteface to the database routines. @@ -63,7 +63,7 @@ quote_postgres(char *arg, int lineno) return res; } -#if defined(__GNUC__) && (defined (__powerpc__) || defined(__AMD64__) || defined(__x86_64__)) +#if defined(__GNUC__) && (defined (__powerpc__) || defined(__amd64__) || defined(__x86_64__)) #define APREF ap #else #define APREF *ap @@ -171,7 +171,7 @@ create_statement(int lineno, int compat, int force_indicator, struct connection if (!(var = (struct variable *) ECPGalloc(sizeof(struct variable), lineno))) return false; -#if defined(__GNUC__) && (defined (__powerpc__) || defined(__AMD64__) || defined(__x86_64__)) +#if defined(__GNUC__) && (defined (__powerpc__) || defined(__amd64__) || defined(__x86_64__)) ECPGget_variable(ap, type, var, true); #else ECPGget_variable(&ap, type, var, true); diff --git a/src/interfaces/ecpg/ecpglib/extern.h b/src/interfaces/ecpg/ecpglib/extern.h index ef4461bc18..a342231809 100644 --- a/src/interfaces/ecpg/ecpglib/extern.h +++ b/src/interfaces/ecpg/ecpglib/extern.h @@ -125,7 +125,7 @@ PGresult **ECPGdescriptor_lvalue(int line, const char *descriptor); bool ECPGstore_result(const PGresult *results, int act_field, const struct statement * stmt, struct variable * var); bool ECPGstore_input(const int, const bool, const struct variable *, const char **, bool *); -#if defined(__GNUC__) && (defined (__powerpc__) || defined(__AMD64__) || defined(__x86_64__)) +#if defined(__GNUC__) && (defined (__powerpc__) || defined(__amd64__) || defined(__x86_64__)) // work around a gcc/ABI bug with va_lists on ppc+amd64 void ECPGget_variable(va_list, enum ECPGttype, struct variable *, bool); #else