From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 2 Mar 2017 16:28:41 +0000 (+0100)
Subject: Remove header file inclusion guard from elf/get-dynamic-info.h
X-Git-Tag: glibc-2.26~745
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a10e9c4e53fc652b79abf838f7f837589d2c84db;p=thirdparty%2Fglibc.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index bed3bd1e5c7..56ef82760da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+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]
diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h
index 64135589751..7525c3a5b20 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 */