propagate from branch 'com.redhat.elfutils.roland.pending' (head e5cfdd13aa39dfae16b905fd57ff56ad8a131bb5)

            to branch 'com.redhat.elfutils' (head 60222fc1981540f15e674b6705fd7a6f628f95a4)

5 files changed, 7 insertions, 14 deletions

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index 77bafae3..baf58974 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,10 +1,3 @@
-2006-07-12  Ulrich Drepper  <[email protected]>
-
-	* elf32_updatefile.c: Adjust for internal_function_def removal.
-	* elf32_updatenull.c: Likewise.
-	* elf_begin.c: Likewise.
-	* elf_getdata.c: Likewise.
-
 2006-07-11  Ulrich Drepper  <[email protected]>
 
 	* libelf.h: Define ELF_T_GNUHASH.
diff --git a/libelf/elf32_updatefile.c b/libelf/elf32_updatefile.c
index 68253651..6eab3cf0 100644
--- a/libelf/elf32_updatefile.c
+++ b/libelf/elf32_updatefile.c
@@ -112,7 +112,7 @@ sort_sections (Elf_Scn **scns, Elf_ScnList *list)
 
 
 int
-internal_function
+internal_function_def
 __elfw2(LIBELFBITS,updatemmap) (Elf *elf, int change_bo, size_t shnum)
 {
   ElfW2(LIBELFBITS,Ehdr) *ehdr;
@@ -444,7 +444,7 @@ fill (int fd, off_t pos, size_t len, char *fillbuf, size_t *filledp)
 
 
 int
-internal_function
+internal_function_def
 __elfw2(LIBELFBITS,updatefile) (Elf *elf, int change_bo, size_t shnum)
 {
   char fillbuf[FILLBUFSIZE];
diff --git a/libelf/elf32_updatenull.c b/libelf/elf32_updatenull.c
index 3b926c1f..3516c091 100644
--- a/libelf/elf32_updatenull.c
+++ b/libelf/elf32_updatenull.c
@@ -132,7 +132,7 @@ ELFW(default_ehdr,LIBELFBITS) (Elf *elf, ElfW2(LIBELFBITS,Ehdr) *ehdr,
 
 
 off_t
-internal_function
+internal_function_def
 __elfw2(LIBELFBITS,updatenull) (Elf *elf, int *change_bop, size_t shnum)
 {
   ElfW2(LIBELFBITS,Ehdr) *ehdr = INTUSE(elfw2(LIBELFBITS,getehdr)) (elf);
diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c
index be52f464..c6ef7947 100644
--- a/libelf/elf_begin.c
+++ b/libelf/elf_begin.c
@@ -1,5 +1,5 @@
 /* Create descriptor for processing file.
-   Copyright (C) 1998-2005, 2006 Red Hat, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Red Hat, Inc.
    This file is part of Red Hat elfutils.
    Written by Ulrich Drepper <[email protected]>, 1998.
 
@@ -434,7 +434,7 @@ file_read_elf (int fildes, void *map_address, unsigned char *e_ident,
 
 
 Elf *
-internal_function
+internal_function_def
 __libelf_read_mmaped_file (int fildes, void *map_address,  off_t offset,
 			   size_t maxsize, Elf_Cmd cmd, Elf *parent)
 {
@@ -702,7 +702,7 @@ read_long_names (Elf *elf)
 
 /* Read the next archive header.  */
 int
-internal_function
+internal_function_def
 __libelf_next_arhdr (elf)
      Elf *elf;
 {
diff --git a/libelf/elf_getdata.c b/libelf/elf_getdata.c
index 1fa4a17f..5e37cbeb 100644
--- a/libelf/elf_getdata.c
+++ b/libelf/elf_getdata.c
@@ -215,7 +215,7 @@ convert_data (Elf_Scn *scn, int version __attribute__ ((unused)), int eclass,
 
 /* Store the information for the raw data in the `rawdata' element.  */
 int
-internal_function
+internal_function_def
 __libelf_set_rawdata (Elf_Scn *scn)
 {
   size_t offset;