From bf53b53dbda2a0a0fadb5da82f9954d5237e013a Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Mon, 1 Nov 2010 15:48:52 +0000 Subject: 2010-11-01 Marcus Brinkmann * src/w32-gettext.c (CreateFileA): Rename to ... (MyCreateFileA): ... this, but provide macro CreateFileA. --- ChangeLog | 5 +++++ src/w32-gettext.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6646402..7f8eee4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-11-01 Marcus Brinkmann + + * src/w32-gettext.c (CreateFileA): Rename to ... + (MyCreateFileA): ... this, but provide macro CreateFileA. + 2010-10-31 Werner Koch * src/init.c (abort): Use TerminateProcess; exit would call atexit diff --git a/src/w32-gettext.c b/src/w32-gettext.c index dc9cbd9..fbb256e 100644 --- a/src/w32-gettext.c +++ b/src/w32-gettext.c @@ -58,7 +58,7 @@ static wchar_t *utf8_to_wchar (const char *string, size_t length, size_t *retlen); static HANDLE -CreateFileA (LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwSharedMode, +MyCreateFileA (LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwSharedMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes, DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile) @@ -81,6 +81,8 @@ CreateFileA (LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwSharedMode, SetLastError (err); return result; } +#undef CreateFileA +#define CreateFileA MyCreateFileA #endif -- cgit v1.2.3