BUG #4662: make failed using MinGW under WinXP

The following bug has been logged online:

Bug reference:      4662
Logged by:          Pavel Golub
Email address:      pavel.golub@gf.microolap.com
PostgreSQL version: 8.4
Operating system:   Windows XP SP3
Description:        make failed using MinGW under WinXP
Details:

$ make

We got an error:

...
In file included from
e:/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../include/security.h:38,
from libpq-int.h:57,
from fe-auth.h:18,
from fe-auth.c:48:
e:/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../include/sspi.h:60: error:
syntax error before “SECURITY_STRING”
In file included from
e:/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../include/security.h:39,
from libpq-int.h:57,
from fe-auth.h:18,
from fe-auth.c:48:
e:/mingw/bin/../lib/gcc/mingw32/3.4.5/../../../../include/ntsecpkg.h:123:
error: syntax error before “SECURITY_STRING”
…

This issue was discussed in the Hackers PostgreSQL mailing list and
discussion could be found in the archive
(http://postgresqlorg.blogspot.com/2008/09/hackers-83-4-vista-mingw-initdb.h
tml).

The solution is to add an additional header file to
postgresql/src/include/libpq/libpq-be.h
and
postgresql/src/interfaces/libpq/libpq-int.h:

…
#ifdef ENABLE_SSPI
#define SECURITY_WIN32
#include <ntsecapi.h> <——- Add this include
#include <security.h>
#undef SECURITY_WIN32
…

Just interesting, will this patch be present in 8.4.x branch of PostgreSQL
sources?