commit 76627277647e3bf4dc4968193db657f16ad9b4d0
author Kai Tietz <ktietz70@googlemail.com> Fri Oct 12 06:54:59 2007 +0000
committer Kai Tietz <ktietz70@googlemail.com> Fri Oct 12 06:54:59 2007 +0000
tree 126fcb34ca41e62ccdf8bf774715c740c4822ffb
parent 798e98bbcfbc941e1e5b9b7f81723d761bf5da00

Make definition of abort macro safe.



git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@115 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/include/assert.h

diff --git a/mingw-w64-headers/include/assert.h b/mingw-w64-headers/include/assert.h
index e88f4a3..bb83c20 100755
--- a/mingw-w64-headers/include/assert.h
+++ b/mingw-w64-headers/include/assert.h
@@ -27,7 +27,12 @@
 __CRT_INLINE void __cdecl _Exit(int status)
 {  _exit(status); }
 #endif
-_CRTIMP void __cdecl __declspec(noreturn) abort(void);
+
+#pragma push_macro("abort")
+#undef abort
+  _CRTIMP void __cdecl __declspec(noreturn) abort(void);
+#pragma pop_macro("abort")
+
 #endif
 
 #ifdef __cplusplus

mingw-w64-headers/include/process.h

diff --git a/mingw-w64-headers/include/process.h b/mingw-w64-headers/include/process.h
index f611c62..4458f10 100755
--- a/mingw-w64-headers/include/process.h
+++ b/mingw-w64-headers/include/process.h
@@ -32,7 +32,12 @@
 #define _CRT_TERMINATE_DEFINED
   _CRTIMP __declspec(noreturn) void __cdecl exit(int _Code);
   _CRTIMP __declspec(noreturn) void __cdecl _exit(int _Code);
-  _CRTIMP void __cdecl abort(void);
+
+#pragma push_macro("abort")
+#undef abort
+  _CRTIMP void __cdecl __declspec(noreturn) abort(void);
+#pragma pop_macro("abort")
+
 #endif
 
   _CRTIMP void __cdecl _cexit(void);

mingw-w64-headers/include/stdlib.h

diff --git a/mingw-w64-headers/include/stdlib.h b/mingw-w64-headers/include/stdlib.h
index c96c731..856c605 100755
--- a/mingw-w64-headers/include/stdlib.h
+++ b/mingw-w64-headers/include/stdlib.h
@@ -235,7 +235,12 @@
   __CRT_INLINE void __cdecl _Exit(int status)
   {  _exit(status); }
 #endif
+
+#pragma push_macro("abort")
+#undef abort
   _CRTIMP void __cdecl __declspec(noreturn) abort(void);
+#pragma pop_macro("abort")
+
 #endif
 
   _CRTIMP unsigned int __cdecl _set_abort_behavior(unsigned int _Flags,unsigned int _Mask);

mingw-w64-headers/include/unwind.h

diff --git a/mingw-w64-headers/include/unwind.h b/mingw-w64-headers/include/unwind.h
index 04c6b0d..4eb1da1 100755
--- a/mingw-w64-headers/include/unwind.h
+++ b/mingw-w64-headers/include/unwind.h
@@ -220,7 +220,10 @@
 static inline _Unwind_Ptr
 _Unwind_GetTextRelBase (struct _Unwind_Context *_C __attribute__ ((__unused__)))
 {
+#pragma push_macro("abort")
+#undef abort
   abort ();
+#pragma pop_macro("abort")
   return 0;
 }