merge of 67f3844b544f03a64b3ac896c19f94744923d76a

     and ba017f6b59b4ad649cf32f4eefdfecca8b31332c

7 files changed, 20 insertions, 11 deletions

diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
index dd0b9b69..dafa98c8 100644
--- a/libdwfl/ChangeLog
+++ b/libdwfl/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-12  Ulrich Drepper  <drepper@redhat.com>
+
+	* cu.c: Adjust for internal_function_def removal.
+	* dwfl_error.c: Likewise.
+	* dwfl_module.c: Likewise.
+	* dwfl_module_getdwarf.c: Likewise.
+	* lines.c: Likewise.
+	* relocate.c: Likewise.
+
 2006-07-11  Ulrich Drepper  <drepper@redhat.com>
 
 	* dwfl_module.c (compare_modules): Don't return GElf_Sxword value,
diff --git a/libdwfl/cu.c b/libdwfl/cu.c
index 4c6d876e..8f01ea6b 100644
--- a/libdwfl/cu.c
+++ b/libdwfl/cu.c
@@ -248,7 +248,7 @@ intern_cu (Dwfl_Module *mod, Dwarf_Off cuoff, struct dwfl_cu **result)
 /* Traverse all the CUs in the module.  */
 
 Dwfl_Error
-internal_function_def
+internal_function
 __libdwfl_nextcu (Dwfl_Module *mod, struct dwfl_cu *lastcu,
 		  struct dwfl_cu **cu)
 {
@@ -315,7 +315,7 @@ arangecu (Dwfl_Module *mod, struct dwfl_arange *arange, struct dwfl_cu **cu)
 }
 
 Dwfl_Error
-internal_function_def
+internal_function
 __libdwfl_addrcu (Dwfl_Module *mod, Dwarf_Addr addr, struct dwfl_cu **cu)
 {
   struct dwfl_arange *arange;
diff --git a/libdwfl/dwfl_error.c b/libdwfl/dwfl_error.c
index 891fbf71..414fbaf4 100644
--- a/libdwfl/dwfl_error.c
+++ b/libdwfl/dwfl_error.c
@@ -1,5 +1,5 @@
 /* Error handling in libdwfl.
-   Copyright (C) 2005 Red Hat, Inc.
+   Copyright (C) 2005, 2006 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -162,14 +162,14 @@ canonicalize (Dwfl_Error error)
 }
 
 int
-internal_function_def
+internal_function
 __libdwfl_canon_error (Dwfl_Error error)
 {
   return canonicalize (error);
 }
 
 void
-internal_function_def
+internal_function
 __libdwfl_seterrno (Dwfl_Error error)
 {
   int value = canonicalize (error);
diff --git a/libdwfl/dwfl_module.c b/libdwfl/dwfl_module.c
index e3db1e06..3ccf8b16 100644
--- a/libdwfl/dwfl_module.c
+++ b/libdwfl/dwfl_module.c
@@ -64,7 +64,7 @@ nofree (void *arg __attribute__ ((unused)))
 }
 
 void
-internal_function_def
+internal_function
 __libdwfl_module_free (Dwfl_Module *mod)
 {
   if (mod->lazy_cu_root != NULL)
diff --git a/libdwfl/dwfl_module_getdwarf.c b/libdwfl/dwfl_module_getdwarf.c
index 1688f1e4..07248bf7 100644
--- a/libdwfl/dwfl_module_getdwarf.c
+++ b/libdwfl/dwfl_module_getdwarf.c
@@ -319,7 +319,7 @@ find_symtab (Dwfl_Module *mod)
 
 /* Try to open a libebl backend for MOD.  */
 Dwfl_Error
-internal_function_def
+internal_function
 __libdwfl_module_getebl (Dwfl_Module *mod)
 {
   if (mod->ebl == NULL)
diff --git a/libdwfl/lines.c b/libdwfl/lines.c
index 49005a0d..ed4267fc 100644
--- a/libdwfl/lines.c
+++ b/libdwfl/lines.c
@@ -1,5 +1,5 @@
 /* Fetch source line info for CU.
-   Copyright (C) 2005 Red Hat, Inc.
+   Copyright (C) 2005, 2006 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@
 #include "../libdw/libdwP.h"
 
 Dwfl_Error
-internal_function_def
+internal_function
 __libdwfl_cu_getsrclines (struct dwfl_cu *cu)
 {
   if (cu->lines == NULL)
diff --git a/libdwfl/relocate.c b/libdwfl/relocate.c
index f0013e3b..96cedcc3 100644
--- a/libdwfl/relocate.c
+++ b/libdwfl/relocate.c
@@ -55,7 +55,7 @@ typedef uint8_t GElf_Byte;
    We update the section header in place to cache the result.  */
 
 Dwfl_Error
-internal_function_def
+internal_function
 __libdwfl_relocate_value (Dwfl_Module *mod, size_t symshstrndx,
 			  Elf32_Word shndx, GElf_Addr *value)
 {
@@ -97,7 +97,7 @@ __libdwfl_relocate_value (Dwfl_Module *mod, size_t symshstrndx,
 }
 
 Dwfl_Error
-internal_function_def
+internal_function
 __libdwfl_relocate (Dwfl_Module *mod, Elf *debugfile)
 {
   assert (mod->e_type == ET_REL);