libpq build problem with <io.h> on MS VC++ 7.0

Hi all

When building libpq using Visual Studio .NET 2002 (ie Visual C++ 7.0), I
encounter this error:

fe-lobj.c
C:\Program Files\Microsoft Visual Studio .NET\Vc7\include\io.h(205) : error
C2375: 'pgrename' : redefinition; different linkage
c:\libs\postgresql\src\include\port.h(148) : see declaration of
'pgrename'
C:\Program Files\Microsoft Visual Studio .NET\Vc7\include\io.h(275) : error
C2375: 'pgunlink' : redefinition; different linkage
c:\libs\postgresql\src\include\port.h(149) : see declaration of
'pgunlink'

As rename/unlink are #define'd to pgrename/pgunlink prior to <io.h>'s inclusion.

Simply reordering the headers fixes the problem (see attachment).

I believe this may be a problem on my compiler, but not necessarily others,
due to an additional compiler directive on the definition in io.h:

#define _CRTIMP __declspec(dllimport)
...
_CRTIMP int __cdecl unlink(const char *);

port.h's definition of pgrename() is obviously lacking a __declspec(dllimport).

Regards,

--
Andrew Francis
Lead Developer - Software
Family Health Network