Prevent warning in pldd.

diff --git a/ChangeLog b/ChangeLog
index 95c737fc11c044c51d14f22a252dab8ac85ec4c2..8f7fa94fca589130de8ff3969112fc14593967f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-16  Marek Polacek  <polacek@redhat.com>
+
+       * elf/pldd-xx.c: Rename static_assert to pldd_assert.
+
 2012-04-16  Marek Polacek  <polacek@redhat.com>
 
        * sysdeps/i386/fpu/bits/fenv.h (feraiseexcept): Reverse the

diff --git a/elf/pldd-xx.c b/elf/pldd-xx.c
index 6a9edcbd4a930b84ba56cd7dfb2e74e8e1da4063..cf49c57b13decb581c2d5ae6715863349174b790 100644 (file)
--- a/elf/pldd-xx.c
+++ b/elf/pldd-xx.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2011-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@gmail.com>, 2011.
 
@@ -23,7 +23,7 @@
 #define EW_(e, w, t) EW__(e, w, _##t)
 #define EW__(e, w, t) e##w##t
 
-#define static_assert(name, exp) \
+#define pldd_assert(name, exp) \
   typedef int __assert_##name[((exp) != 0) - 1]
 
 
@@ -39,11 +39,11 @@ struct E(link_map)
   EW(Addr) l_libname;
 };
 #if CLASS == __ELF_NATIVE_CLASS
-static_assert (l_addr, (offsetof (struct link_map, l_addr)
+pldd_assert (l_addr, (offsetof (struct link_map, l_addr)
                        == offsetof (struct E(link_map), l_addr)));
-static_assert (l_name, (offsetof (struct link_map, l_name)
+pldd_assert (l_name, (offsetof (struct link_map, l_name)
                        == offsetof (struct E(link_map), l_name)));
-static_assert (l_next, (offsetof (struct link_map, l_next)
+pldd_assert (l_next, (offsetof (struct link_map, l_next)
                        == offsetof (struct E(link_map), l_next)));
 #endif
 
@@ -54,9 +54,9 @@ struct E(libname_list)
   EW(Addr) next;
 };
 #if CLASS == __ELF_NATIVE_CLASS
-static_assert (name, (offsetof (struct libname_list, name)
+pldd_assert (name, (offsetof (struct libname_list, name)
                      == offsetof (struct E(libname_list), name)));
-static_assert (next, (offsetof (struct libname_list, next)
+pldd_assert (next, (offsetof (struct libname_list, next)
                      == offsetof (struct E(libname_list), next)));
 #endif
 
@@ -69,9 +69,9 @@ struct E(r_debug)
   EW(Addr) r_map;
 };
 #if CLASS == __ELF_NATIVE_CLASS
-static_assert (r_version, (offsetof (struct r_debug, r_version)
+pldd_assert (r_version, (offsetof (struct r_debug, r_version)
                           == offsetof (struct E(r_debug), r_version)));
-static_assert (r_map, (offsetof (struct r_debug, r_map)
+pldd_assert (r_map, (offsetof (struct r_debug, r_map)
                       == offsetof (struct E(r_debug), r_map)));
 #endif