More #ifdef fun: src/interfaces/libpq/win32.c

Hi Tom-san.

I think that it should be in this way.

#include "postgres_fe.h"
#ifdef WIN32
#include "win32.h"
#endif

However, I am still under try by the reason for seeing the error of now a few.

Regards,
Hiroshi Saito

----- Original Message -----
From: "Tom Lane"

Tom Lane wrote:

src/interfaces/libpq/win32.c contains

/* Declared here to avoid pulling in all includes, which causes name collissions */
#ifdef ENABLE_NLS
extern char *
libpq_gettext(const char *msgid)
__attribute__((format_arg(1)));
#else
#define libpq_gettext(x) (x)
#endif

Now, since it has nowhere bothered to #include pg_config.h, ENABLE_NLS
will certainly not be defined, and so this code always fails to invoke
gettext.

This may not be real important since the file appears to use gettext
only here:

if (!success)
sprintf(strerrbuf, libpq_gettext("Unknown socket error (0x%08X/%i)"), err, err);

but it's still pretty bogus.

Without a Windows machine, I'm not in a position to try making this file
properly include postgres_fe.h, or at least c.h, but someone ought to
try harder.

I have applied the following patch to include postgres_fe.h in two
win32-specific files. I think the authors thought where was no
pg-specific code in there, but now there is, or might be in the future.
I see no reason to backpatch this.

--
Bruce Momjian bruce@momjian.us
EnterpriseDB http://www.enterprisedb.com

+ If your life is a hard drive, Christ can be your backup. +