5059ab35f3
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1552 6952d904-891a-0410-993b-d76249ca496b
45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
Index: assert/assert.h
|
|
===================================================================
|
|
RCS file: /cvs/glibc/libc/assert/assert.h,v
|
|
retrieving revision 1.25
|
|
retrieving revision 1.26
|
|
diff -u -r1.25 -r1.26
|
|
--- assert/assert.h 15 Aug 2003 17:54:31 -0000 1.25
|
|
+++ assert/assert.h 4 Oct 2004 07:45:23 -0000 1.26
|
|
@@ -84,33 +84,16 @@
|
|
|
|
__END_DECLS
|
|
|
|
-/* For the macro definition we use gcc's __builtin_expect if possible
|
|
- to generate good code for the non-error case. gcc 3.0 is a good
|
|
- enough estimate for when the feature became available. */
|
|
-# if __GNUC_PREREQ (3, 0)
|
|
-# define assert(expr) \
|
|
- (__ASSERT_VOID_CAST (__builtin_expect (!!(expr), 1) ? 0 : \
|
|
- (__assert_fail (__STRING(expr), __FILE__, __LINE__, \
|
|
- __ASSERT_FUNCTION), 0)))
|
|
-# else
|
|
-# define assert(expr) \
|
|
+# define assert(expr) \
|
|
(__ASSERT_VOID_CAST ((expr) ? 0 : \
|
|
(__assert_fail (__STRING(expr), __FILE__, __LINE__, \
|
|
__ASSERT_FUNCTION), 0)))
|
|
-# endif
|
|
|
|
# ifdef __USE_GNU
|
|
-# if __GNUC_PREREQ (3, 0)
|
|
-# define assert_perror(errnum) \
|
|
- (__ASSERT_VOID_CAST (__builtin_expect (!(errnum), 1) ? 0 : \
|
|
- (__assert_perror_fail ((errnum), __FILE__, __LINE__, \
|
|
- __ASSERT_FUNCTION), 0)))
|
|
-# else
|
|
-# define assert_perror(errnum) \
|
|
+# define assert_perror(errnum) \
|
|
(__ASSERT_VOID_CAST (!(errnum) ? 0 : \
|
|
(__assert_perror_fail ((errnum), __FILE__, __LINE__, \
|
|
__ASSERT_FUNCTION), 0)))
|
|
-# endif
|
|
# endif
|
|
|
|
/* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'
|