about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-03-02 17:28:41 +0100
committerFlorian Weimer <fweimer@redhat.com>2017-03-02 17:28:41 +0100
commita10e9c4e53fc652b79abf838f7f837589d2c84db (patch)
treec28df06117c5986ed75e9ab1524393713aef32ca
parent2d6ab5df3b675e96ee587ae6a8c2ce004c6b1ba9 (diff)
downloadglibc-a10e9c4e53fc652b79abf838f7f837589d2c84db.tar.gz
glibc-a10e9c4e53fc652b79abf838f7f837589d2c84db.tar.xz
glibc-a10e9c4e53fc652b79abf838f7f837589d2c84db.zip
Remove header file inclusion guard from elf/get-dynamic-info.h
This file is included multiple times, so the guard is harmful.
Fixes commit 9090848d0607e93fb08a1d68d9f263846ee33f02.
-rw-r--r--ChangeLog4
-rw-r--r--elf/get-dynamic-info.h6
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bed3bd1e5c..56ef82760d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2017-03-02  Florian Weimer  <fweimer@redhat.com>
 
+	* elf/get-dynamic-info.h: Remove header file inclusion guard.
+
+2017-03-02  Florian Weimer  <fweimer@redhat.com>
+
 	[BZ #21015]
 	* manual/install.texi (Configuring and compiling): Document
 	--enable-bind-now.
diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h
index 6413558975..7525c3a5b2 100644
--- a/elf/get-dynamic-info.h
+++ b/elf/get-dynamic-info.h
@@ -16,8 +16,8 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _GET_DYNAMIC_INFO_H
-#define _GET_DYNAMIC_INFO_H 1
+/* This file is included multiple times and therefore lacks a header
+   file inclusion guard.  */
 
 #include <assert.h>
 #include <libc-diag.h>
@@ -182,5 +182,3 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
     info[DT_RPATH] = NULL;
 #endif
 }
-
-#endif /* get-dynamic-info.h */