3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 52f6be1..6646402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-31  Werner Koch  <wk@g10code.com>
+
+	* src/init.c (abort): Use TerminateProcess; exit would call atexit
+	functions.
+
 2010-10-29  Marcus Brinkmann  <marcus.brinkmann@ruhr-uni-bochum.de>
 
 	* src/w32-gettext.c: Guard include of <sys/types.h>.  Do not
diff --git a/src/init.c b/src/init.c
index 10f8e43..d4282ac 100644
--- a/src/init.c
+++ b/src/init.c
@@ -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
 
diff --git a/src/w32-gettext.c b/src/w32-gettext.c
index 8a67ce7..dc9cbd9 100644
--- a/src/w32-gettext.c
+++ b/src/w32-gettext.c
@@ -1234,7 +1234,8 @@ load_domain (const char *filename)
   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;