From 697f4db2f34c054a2f93b45dbdbbaec82e34a409 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 10 Jun 2006 06:50:47 +0000
Subject: merge of 2043b4a4bc8f0359b8c216306758ab5900533fde      and
 fde883376d5d9573d47686c91400d14495518411

---
 libelf/libelfP.h | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'libelf/libelfP.h')

diff --git a/libelf/libelfP.h b/libelf/libelfP.h
index ed6b5f7f..54158aeb 100644
--- a/libelf/libelfP.h
+++ b/libelf/libelfP.h
@@ -1,5 +1,5 @@
 /* Internal interfaces for libelf.
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 Red Hat, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 1998.
 
@@ -546,9 +546,8 @@ extern uint32_t __libelf_crc32 (uint32_t crc, unsigned char *buf, size_t len)
 
 
 /* We often have to update a flag iff a value changed.  Make this
-   convenient.  None of the parameters must have a side effect.  */
-#ifdef __GNUC__
-# define update_if_changed(var, exp, flag) \
+   convenient.  */
+#define update_if_changed(var, exp, flag) \
   do {									      \
     __typeof__ (var) *_var = &(var);					      \
     __typeof__ (exp) _exp = (exp);					      \
@@ -558,15 +557,5 @@ extern uint32_t __libelf_crc32 (uint32_t crc, unsigned char *buf, size_t len)
 	(flag) |= ELF_F_DIRTY;						      \
       }									      \
   } while (0)
-#else
-# define update_if_changed(var, exp, flag) \
-  do {									      \
-    if ((var) != (exp))							      \
-      {									      \
-	(var) = (exp);							      \
-	(flag) |= ELF_F_DIRTY;						      \
-      }									      \
-  } while (0)
-#endif
 
 #endif  /* libelfP.h */
-- 
cgit v1.2.3