From 8ec4b8c8bd7096fbf9903ed95cc62390cecf5024 Mon Sep 17 00:00:00 2001
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 4 Apr 2012 22:10:04 +0200
Subject: [PATCH] Bug #35752: Make include guards standard-compliant

Include guards were adjusted because a few of them tampered with the name space
that is reserved for identifiers in C compiler implementations.
https://www.securecoding.cert.org/confluence/display/seccode/DCL37-C.+Do+not+declare+or+define+a+reserved+identifier#DCL37-C.Donotdeclareordefineareservedidentifier-NoncompliantCodeExample%28HeaderGuard%29
---
 lib/unused-result.h |    4 ++--
 locate/locatedb.h   |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/unused-result.h b/lib/unused-result.h
index 050440c..4147f47 100644
--- a/lib/unused-result.h
+++ b/lib/unused-result.h
@@ -16,8 +16,8 @@
 */
 
 /* Taken from coreutils' fts_.h */
-#ifndef _UNUSED_RESULT_H
-# define _UNUSED_RESULT_H 1
+#ifndef UNUSED_RESULT_H
+# define UNUSED_RESULT_H 1
 
 # ifndef __GNUC_PREREQ
 #  if defined __GNUC__ && defined __GNUC_MINOR__
diff --git a/locate/locatedb.h b/locate/locatedb.h
index ff79b31..e6d4546 100644
--- a/locate/locatedb.h
+++ b/locate/locatedb.h
@@ -15,8 +15,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef _LOCATEDB_H
-#define _LOCATEDB_H 1
+#ifndef LOCATEDB_H
+#define LOCATEDB_H 1
 
 /* The magic string at the start of a locate database, to make sure
    it's in the right format.  The 02 is the database format version number.
@@ -69,4 +69,4 @@ bool putword (FILE *fp, int word,
 
 #define SLOCATE_DB_MAGIC_LEN 2
 
-#endif /* !_LOCATEDB_H */
+#endif /* !LOCATEDB_H */
-- 
1.7.9.2

