From 75c89108ab4b7c5454fe13b07fb392e2143fb57e Mon Sep 17 00:00:00 2001
From: Federico Kircheis <federico.kircheis@gmail.com>
Date: Sun, 7 Jul 2019 13:04:51 +0200
Subject: [PATCH] Avoid using reserved identifiers

Found with `clang -Wreserved-id-macro`
---
 mutt/queue.h          | 6 +++---
 test/address/common.h | 6 +++---
 test/config/common.h  | 6 +++---
 test/file/common.h    | 6 +++---
 test/md5/common.h     | 6 +++---
 test/rfc2047/common.h | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/mutt/queue.h b/mutt/queue.h
index b6a8b755b..91839e8fa 100644
--- a/mutt/queue.h
+++ b/mutt/queue.h
@@ -30,8 +30,8 @@
  * $FreeBSD: head/sys/sys/queue.h 314436 2017-02-28 23:42:47Z imp $
  */
 
-#ifndef _SYS_QUEUE_H_
-#define	_SYS_QUEUE_H_
+#ifndef SYS_QUEUE_H_
+#define SYS_QUEUE_H_
 
 /*
  * This file defines four types of data structures: singly-linked lists,
@@ -853,4 +853,4 @@ struct {								\
 		(head2)->tqh_last = &(head2)->tqh_first;		\
 } while (0)
 
-#endif /* !_SYS_QUEUE_H_ */
+#endif /* !SYS_QUEUE_H_ */
diff --git a/test/address/common.h b/test/address/common.h
index 47651e03d..78ae7416d 100644
--- a/test/address/common.h
+++ b/test/address/common.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TEST_ADDRESS_COMMON_H
-#define _TEST_ADDRESS_COMMON_H
+#ifndef TEST_ADDRESS_COMMON_H
+#define TEST_ADDRESS_COMMON_H
 
 #define TEST_NO_MAIN
 #include "acutest.h"
@@ -39,4 +39,4 @@
     }                                                                          \
   } while (false)
 
-#endif /* _TEST_ADDRESS_COMMON_H */
+#endif /* TEST_ADDRESS_COMMON_H */
diff --git a/test/config/common.h b/test/config/common.h
index 0ce9b9b71..4ecbfbc86 100644
--- a/test/config/common.h
+++ b/test/config/common.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TEST_COMMON_H
-#define _TEST_COMMON_H
+#ifndef TEST_COMMON_H
+#define TEST_COMMON_H
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -45,4 +45,4 @@ int log_observer(struct NotifyCallback *nc);
 void set_list(const struct ConfigSet *cs);
 void cs_dump_set(const struct ConfigSet *cs);
 
-#endif /* _TEST_COMMON_H */
+#endif /* TEST_COMMON_H */
diff --git a/test/file/common.h b/test/file/common.h
index 4694b060f..1857d082c 100644
--- a/test/file/common.h
+++ b/test/file/common.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TEST_FILE_COMMON_H
-#define _TEST_FILE_COMMON_H
+#ifndef TEST_FILE_COMMON_H
+#define TEST_FILE_COMMON_H
 
 #include "acutest.h"
 #include "config.h"
@@ -37,4 +37,4 @@ size_t file_num_test_lines(void);
 #define SET_UP() (file_set_up(__func__))
 #define TEAR_DOWN(fp) (file_tear_down((fp), __func__))
 
-#endif /* _TEST_FILE_COMMON_H */
+#endif /* TEST_FILE_COMMON_H */
diff --git a/test/md5/common.h b/test/md5/common.h
index 4f1c93b66..bf4835b77 100644
--- a/test/md5/common.h
+++ b/test/md5/common.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TEST_MD5_COMMON_H
-#define _TEST_MD5_COMMON_H
+#ifndef TEST_MD5_COMMON_H
+#define TEST_MD5_COMMON_H
 
 #define TEST_NO_MAIN
 #include "acutest.h"
@@ -35,4 +35,4 @@ struct Md5TestData
 
 extern const struct Md5TestData md5_test_data[];
 
-#endif /* _TEST_MD5_COMMON_H */
+#endif /* TEST_MD5_COMMON_H */
diff --git a/test/rfc2047/common.h b/test/rfc2047/common.h
index 802b62609..a773d95a8 100644
--- a/test/rfc2047/common.h
+++ b/test/rfc2047/common.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _TEST_RFC2047_COMMON_H
-#define _TEST_RFC2047_COMMON_H
+#ifndef TEST_RFC2047_COMMON_H
+#define TEST_RFC2047_COMMON_H
 
 #define TEST_NO_MAIN
 #include "acutest.h"
@@ -38,4 +38,4 @@ struct Rfc2047TestData
 
 extern const struct Rfc2047TestData rfc2047_test_data[];
 
-#endif /* _TEST_RFC2047_COMMON_H */
+#endif /* TEST_RFC2047_COMMON_H */
-- 
2.40.0