2002-09-23 Roland McGrath <roland@redhat.com>

	* catgets/open_catalog.c (__open_catalog): Don't use a value type
	as the __builtin_expect expression, just the Boolean value.

diff --git a/catgets/open_catalog.c b/catgets/open_catalog.c
index cdcc7b8..674a0c1 100644 (file)
--- a/catgets/open_catalog.c
+++ b/catgets/open_catalog.c
@@ -253,8 +253,7 @@ __open_catalog (const char *cat_name, const char *nlspath, const char *env_var,
   /* Determine whether the file is a catalog file and if yes whether
      it is written using the correct byte order.  Else we have to swap
      the values.  */
-  if (__builtin_expect (catalog->file_ptr->magic, CATGETS_MAGIC)
-      == CATGETS_MAGIC)
+  if (__builtin_expect (catalog->file_ptr->magic == CATGETS_MAGIC, 1))
     swapping = 0;
   else if (catalog->file_ptr->magic == SWAPU32 (CATGETS_MAGIC))
     swapping = 1;