commit b597dfad924980dede10d7c19d87900b6172e599
author Ulrich Drepper <drepper@redhat.com> Tue Oct 16 05:21:27 2007 +0000
committer Ulrich Drepper <drepper@redhat.com> Tue Oct 16 05:21:27 2007 +0000
tree 3c090b69070ad0056d479d90aa1f8829810140ba
parent 3fc3d7bd6bd8485404a936f7354e781dc2be6a5a

merge of '92c36bfdbc6468d1711c043b530e0dfe5abb6dec'
     and 'c22c8c43f8f68b0bffd4d5ccdb2282c958268742'

libdw/libdw.h

diff --git a/libdw/libdw.h b/libdw/libdw.h
index 5385312..70a35b0 100644
--- a/libdw/libdw.h
+++ b/libdw/libdw.h
@@ -62,9 +62,9 @@
 #endif
 
 #ifdef __GNUC_STDC_INLINE__
-# define __extern_inline extern __inline __attribute__ ((__gnu_inline__))
+# define __libdw_extern_inline extern __inline __attribute__ ((__gnu_inline__))
 #else
-# define __extern_inline extern __inline
+# define __libdw_extern_inline extern __inline
 #endif
 
 
@@ -630,14 +630,14 @@
 /* Inline optimizations.  */
 #ifdef __OPTIMIZE__
 /* Return attribute code of given attribute.  */
-__extern_inline unsigned int
+__libdw_extern_inline unsigned int
 dwarf_whatattr (Dwarf_Attribute *attr)
 {
   return attr == NULL ? 0 : attr->code;
 }
 
 /* Return attribute code of given attribute.  */
-__extern_inline unsigned int
+__libdw_extern_inline unsigned int
 dwarf_whatform (Dwarf_Attribute *attr)
 {
   return attr == NULL ? 0 : attr->form;