[svn] gpg-error - r262 - in trunk: . src

[svn author marcus]

Author: marcus
Date: 2010-11-01 16:48:52 +0100 (Mon, 01 Nov 2010)
New Revision: 262

Modified:
   trunk/ChangeLog
   trunk/src/w32-gettext.c
Log:
2010-11-01  Marcus Brinkmann  <marcus.brinkmann at ruhr-uni-bochum.de>

	* src/w32-gettext.c (CreateFileA): Rename to ...
	(MyCreateFileA): ... this, but provide macro CreateFileA.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-11-01 15:08:20 UTC (rev 261)
+++ trunk/ChangeLog	2010-11-01 15:48:52 UTC (rev 262)
@@ -1,3 +1,8 @@
+2010-11-01  Marcus Brinkmann  <marcus.brinkmann at ruhr-uni-bochum.de>
+
+	* src/w32-gettext.c (CreateFileA): Rename to ...
+	(MyCreateFileA): ... this, but provide macro CreateFileA.
+
 2010-10-31  Werner Koch  <wk at g10code.com>
 
 	* src/init.c (abort): Use TerminateProcess; exit would call atexit

Modified: trunk/src/w32-gettext.c
===================================================================
--- trunk/src/w32-gettext.c	2010-11-01 15:08:20 UTC (rev 261)
+++ trunk/src/w32-gettext.c	2010-11-01 15:48:52 UTC (rev 262)
@@ -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 @@
   SetLastError (err);
   return result;
 }
+#undef CreateFileA
+#define CreateFileA MyCreateFileA
 #endif