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

[svn author wk]

Author: wk
Date: 2010-10-31 11:30:16 +0100 (Sun, 31 Oct 2010)
New Revision: 260

Modified:
   trunk/ChangeLog
   trunk/src/init.c
   trunk/src/w32-gettext.c
Log:
s/abort/TerminateProcess/


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-10-29 18:10:11 UTC (rev 259)
+++ trunk/ChangeLog	2010-10-31 10:30:16 UTC (rev 260)
@@ -1,3 +1,8 @@
+2010-10-31  Werner Koch  <wk at g10code.com>
+
+	* src/init.c (abort): Use TerminateProcess; exit would call atexit
+	functions.
+
 2010-10-29  Marcus Brinkmann  <marcus.brinkmann at ruhr-uni-bochum.de>
 
 	* src/w32-gettext.c: Guard include of <sys/types.h>.  Do not

Modified: trunk/src/init.c
===================================================================
--- trunk/src/init.c	2010-10-29 18:10:11 UTC (rev 259)
+++ trunk/src/init.c	2010-10-31 10:30:16 UTC (rev 260)
@@ -37,7 +37,8 @@
 #  define TLS_OUT_OF_INDEXES 0xFFFFFFFF
 # endif
 # ifndef __MINGW32CE__
-#  define abort() exit(1)
+#  /* Replace the Mingw32CE provided abort function.  */
+#  define abort() do { TerminateProcess (GetCurrentProcess(), 8); } while (0)
 # endif
 #endif
 

Modified: trunk/src/w32-gettext.c
===================================================================
--- trunk/src/w32-gettext.c	2010-10-29 18:10:11 UTC (rev 259)
+++ trunk/src/w32-gettext.c	2010-10-31 10:30:16 UTC (rev 260)
@@ -1234,7 +1234,8 @@
   size_t to_read;
   char *read_ptr;
 
-  fh = CreateFileA (filename, GENERIC_READ, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+  fh = CreateFileA (filename, GENERIC_READ, FILE_SHARE_WRITE, NULL,
+                    OPEN_EXISTING, 0, NULL);
   if (fh == INVALID_HANDLE_VALUE)
     return NULL;