Avoid using reserved identifiers

Found with `clang -Wreserved-id-macro`

diff --git a/mutt/queue.h b/mutt/queue.h
index b6a8b755bbcaef35fa1a7ee77e15a355f255c1e5..91839e8fa8691af814db7c9d57fb2e5e39921b4d 100644 (file)
--- 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 47651e03daffb79ff441892c955b4e9e0616754f..78ae7416dc2eb7f0d09ae87c3582b879acc17719 100644 (file)
--- 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 0ce9b9b7151f3a326c2b01b458b0549ca601720c..4ecbfbc8615f15463ed82e943c426c1880193edf 100644 (file)
--- 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 4694b060f8565dfe5480ab0969779fe1d39bbc60..1857d082c3b0a7bfb0008d7e6ec924ba099e3737 100644 (file)
--- 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 4f1c93b666be3cac2bb19c950aea188efae21369..bf4835b77e47563304fff953d8ab85a9cd005f06 100644 (file)
--- 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 802b626092da6702002a51557fcbf8f9b2aec8c5..a773d95a84648ace649542f8d279ad378c17571e 100644 (file)
--- 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 */