* include/assert.h; Remove header guard. undef assert macro.

	(_assert): Use __MINGW_ATTRIB_NORETURN define.

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 00d36d6776feacd299bee8c898c7bcfaf5d5e334..8b5d15f54ed63a6938acf4194f84415a2172cc85 100644 (file)
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-11  Danny Smith  <dannysmith@users.sourceforge.net>
+
+       * include/assert.h; Remove header guard.  #undef assert macro.
+       (_assert): Use __MINGW_ATTRIB_NORETURN define.
+
 2005-02-11  Gregory W. Chicares  <chicares@cox.net>
             Danny Smith  <dannysmith@users.sourceforge.net>
 

diff --git a/winsup/mingw/include/assert.h b/winsup/mingw/include/assert.h
index d33c9a8a758db4c5cc65cb76dc53033b12973505..9d825c9a288b37214ccef04f457b7eb1deb4e93f 100644 (file)
--- a/winsup/mingw/include/assert.h
+++ b/winsup/mingw/include/assert.h
@@ -8,20 +8,22 @@
  *
  */
 
-#ifndef _ASSERT_H_
-#define        _ASSERT_H_
+/* We should be able to include this file multiple times to allow the assert
+   macro to be enabled/disabled for different parts of code.  So don't add a
+   header guard.  */ 
+
+#ifndef RC_INVOKED
 
 /* All the headers include this file. */
 #include <_mingw.h>
 
-#ifndef RC_INVOKED
+#undef assert
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #ifdef NDEBUG
-
 /*
  * If not debugging, assert does nothing.
  */
@@ -33,16 +35,13 @@ extern "C" {
  * CRTDLL nicely supplies a function which does the actual output and
  * call to abort.
  */
-_CRTIMP void __cdecl _assert (const char*, const char*, int)
-#ifdef __GNUC__
-       __attribute__ ((noreturn))
-#endif
-       ;
+_CRTIMP void __cdecl _assert (const char*, const char*, int) __MINGW_ATTRIB_NORETURN;
 
 /*
  * Definition of the assert macro.
  */
 #define assert(e)       ((e) ? (void)0 : _assert(#e, __FILE__, __LINE__))
+
 #endif /* NDEBUG */
 
 #ifdef __cplusplus
@@ -50,6 +49,3 @@ _CRTIMP void __cdecl _assert (const char*, const char*, int)
 #endif
 
 #endif /* Not RC_INVOKED */
-
-#endif /* Not _ASSERT_H_ */
-