From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 15 Aug 2003 17:55:25 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~365
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20d9b98f8a33c85b855e4aa5366acadd979de4d4;p=thirdparty%2Fglibc.git

Update.

2003-08-15  Jakub Jelinek  <jakub@redhat.com>

	* assert/assert.h (assert_perror): Use __builtin_expect for gcc >=
	3.0, not for !gcc or gcc < 3.0.
---

diff --git a/ChangeLog b/ChangeLog
index 8a2b8c0971f..416eceb1068 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-15  Jakub Jelinek  <jakub@redhat.com>
+
+	* assert/assert.h (assert_perror): Use __builtin_expect for gcc >=
+	3.0, not for !gcc or gcc < 3.0.
+
 2003-08-11  Carlos O'Donell  <carlos@baldric.uwo.ca>
 
 	* dlfcn/default.c (main): Cast dlsym loaded value to same type as main.
diff --git a/assert/assert.h b/assert/assert.h
index b511d116d94..7458e15de25 100644
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -102,12 +102,12 @@ __END_DECLS
 # ifdef	__USE_GNU
 #  if __GNUC_PREREQ (3, 0)
 #   define assert_perror(errnum) \
-  (__ASSERT_VOID_CAST (!(errnum) ? 0 :					      \
+  (__ASSERT_VOID_CAST (__builtin_expect (!(errnum), 1) ? 0 :		      \
 		       (__assert_perror_fail ((errnum), __FILE__, __LINE__,   \
 					      __ASSERT_FUNCTION), 0)))
 #  else
 #   define assert_perror(errnum) \
-  (__ASSERT_VOID_CAST (__builtin_expect (!(errnum), 1) ? 0 :		      \
+  (__ASSERT_VOID_CAST (!(errnum) ? 0 :					      \
 		       (__assert_perror_fail ((errnum), __FILE__, __LINE__,   \
 					      __ASSERT_FUNCTION), 0)))
 #  endif