From 376d47874f54adc1d646a59933e95c47dbf88e03 Mon Sep 17 00:00:00 2001
From: Kostyantyn Vorobyov <kostyantyn.vorobyov@cea.fr>
Date: Fri, 9 Jun 2017 11:18:13 +0200
Subject: [PATCH] Add _H suffix to header guards so there is no mix-up with
 control macros

---
 src/plugins/e-acsl/share/e-acsl/e_acsl_alias.h              | 4 ++--
 src/plugins/e-acsl/share/e-acsl/e_acsl_assert.h             | 4 ++--
 src/plugins/e-acsl/share/e-acsl/e_acsl_bits.h               | 4 ++--
 src/plugins/e-acsl/share/e-acsl/e_acsl_debug.h              | 3 +++
 src/plugins/e-acsl/share/e-acsl/e_acsl_gmp_api.h            | 4 ++--
 src/plugins/e-acsl/share/e-acsl/e_acsl_leak.h               | 4 ++--
 src/plugins/e-acsl/share/e-acsl/e_acsl_malloc.h             | 4 ++--
 src/plugins/e-acsl/share/e-acsl/e_acsl_mmodel_api.h         | 4 ++--
 src/plugins/e-acsl/share/e-acsl/e_acsl_printf.h             | 4 ++--
 src/plugins/e-acsl/share/e-acsl/e_acsl_safe_locations.h     | 4 ++--
 src/plugins/e-acsl/share/e-acsl/e_acsl_shexec.h             | 4 ++--
 src/plugins/e-acsl/share/e-acsl/e_acsl_string.h             | 4 ++--
 src/plugins/e-acsl/share/e-acsl/e_acsl_temporal.h           | 3 +++
 src/plugins/e-acsl/share/e-acsl/e_acsl_temporal_timestamp.h | 4 ++--
 src/plugins/e-acsl/share/e-acsl/e_acsl_trace.h              | 4 ++--
 15 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_alias.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_alias.h
index 4c4e12bc519..5f16d6975aa 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_alias.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_alias.h
@@ -26,8 +26,8 @@
  * \brief Function aliasing
 ***************************************************************************/
 
-#ifndef E_ACSL_ALIAS
-#define E_ACSL_ALIAS
+#ifndef E_ACSL_ALIAS_H
+#define E_ACSL_ALIAS_H
 
 /* Concatenation of 2 tokens */
 # define preconcat(x,y) x ## y
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_assert.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_assert.h
index 7311ffe670d..3685c9d990b 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_assert.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_assert.h
@@ -25,8 +25,8 @@
  * \brief E-ACSL assertions and abort statements.
 ***************************************************************************/
 
-#ifndef E_ACSL_ASSERT
-#define E_ACSL_ASSERT
+#ifndef E_ACSL_ASSERT_H
+#define E_ACSL_ASSERT_H
 
 #include <sys/types.h>
 #include <signal.h>
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_bits.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_bits.h
index 01b17be76f9..2933e096cc4 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_bits.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_bits.h
@@ -35,8 +35,8 @@
  * assume little-endian byte order.
 ***************************************************************************/
 
-#ifndef E_ACSL_BITS
-#define E_ACSL_BITS
+#ifndef E_ACSL_BITS_H
+#define E_ACSL_BITS_H
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_debug.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_debug.h
index 12596867e96..86cecc698dd 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_debug.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_debug.h
@@ -24,6 +24,8 @@
  * \file   e_acsl_debug.h
  * \brief  Debug-level functions and macros
 ***************************************************************************/
+#ifndef E_ACSL_DEBUG_H
+#define E_ACSL_DEBUG_H
 
 static void vabort(char *fmt, ...);
 
@@ -109,4 +111,5 @@ int getchar(void);
 #  define DASSERT(_e)
 #  define DVASSERT(_expr, _fmt, ...)
 #endif
+#endif
 // }}}
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_gmp_api.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_gmp_api.h
index 7f9b5d8b685..f274621f893 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_gmp_api.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_gmp_api.h
@@ -30,8 +30,8 @@
 /* GMP prototypes */
 /******************/
 
-#ifndef E_ACSL_GMP_API
-#define E_ACSL_GMP_API
+#ifndef E_ACSL_GMP_API_H
+#define E_ACSL_GMP_API_H
 
 #include "stdlib.h"
 #include "e_acsl_alias.h"
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_leak.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_leak.h
index f01fd4d58f0..40a265a8d37 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_leak.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_leak.h
@@ -26,8 +26,8 @@
  * \brief Functionality to report/track memory leaks. Shared between models
 ***************************************************************************/
 
-#ifndef E_ACSL_HEAP_LEAK
-#define E_ACSL_HEAP_LEAK
+#ifndef E_ACSL_HEAP_LEAK_H
+#define E_ACSL_HEAP_LEAK_H
 
 #include "e_acsl_mmodel_api.h"
 
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_malloc.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_malloc.h
index e31c605d0fb..eb34eed35e3 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_malloc.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_malloc.h
@@ -26,8 +26,8 @@
  * \brief E-ACSL memory allocation bindings.
 ***************************************************************************/
 
-#ifndef E_ACSL_MALLOC
-#define E_ACSL_MALLOC
+#ifndef E_ACSL_MALLOC_H
+#define E_ACSL_MALLOC_H
 
 #include <stdint.h>
 #include <stddef.h>
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_mmodel_api.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_mmodel_api.h
index 04eb97f4078..649e522b701 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_mmodel_api.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_mmodel_api.h
@@ -27,8 +27,8 @@
  * Functions and variables with non-static linkage used for instrumentation.
 ***************************************************************************/
 
-#ifndef E_ACSL_MMODEL
-#define E_ACSL_MMODEL
+#ifndef E_ACSL_MMODEL_H
+#define E_ACSL_MMODEL_H
 
 #include <stddef.h>
 #include "e_acsl_alias.h"
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_printf.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_printf.h
index dcf4a9f5de6..e439fdd5420 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_printf.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_printf.h
@@ -66,8 +66,8 @@
  *      field-width of 8 is used.
 ***************************************************************************/
 
-#ifndef E_ACSL_PRINTF
-#define E_ACSL_PRINTF
+#ifndef E_ACSL_PRINTF_H
+#define E_ACSL_PRINTF_H
 
 #include <unistd.h>
 #include <stdint.h>
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_safe_locations.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_safe_locations.h
index 094a4e69a9c..4ec13c6ed58 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_safe_locations.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_safe_locations.h
@@ -30,8 +30,8 @@
  * Most of these should be declared somewhere in start procedures of c
  * and gcc libraries. One example of a safe location is errno. */
 
-#ifndef E_ACSL_SAFE_LOCATIONS
-#define E_ACSL_SAFE_LOCATIONS
+#ifndef E_ACSL_SAFE_LOCATIONS_H
+#define E_ACSL_SAFE_LOCATIONS_H
 
 #include <stdio.h>
 #include <stdint.h>
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_shexec.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_shexec.h
index 88b1f7b0362..7f7231ae33a 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_shexec.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_shexec.h
@@ -25,8 +25,8 @@
  * \brief Interface for running shell commands
 ***************************************************************************/
 
-#ifndef E_ACSL_SHEXEC
-#define E_ACSL_SHEXEC
+#ifndef E_ACSL_SHEXEC_H
+#define E_ACSL_SHEXEC_H
 
 #include <stddef.h>
 #include <sys/types.h>
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_string.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_string.h
index d73c54e0619..de31ec5b93c 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_string.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_string.h
@@ -36,8 +36,8 @@
  *    of string.h functions use GLIBC-based implementations.
 ***************************************************************************/
 
-#ifndef E_ACSL_STD_STRING
-#define E_ACSL_STD_STRING
+#ifndef E_ACSL_STD_STRING_H
+#define E_ACSL_STD_STRING_H
 
 #ifndef E_ACSL_NO_COMPILER_BUILTINS
 # define memset  __builtin_memset
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal.h
index d728eeb6140..c31d8197a84 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal.h
@@ -24,6 +24,8 @@
  * \file  e_acsl_temporal.h
  * \brief Implementation of the tenporal API shared by all models
 ***************************************************************************/
+#ifndef E_ACSL_TEMPORAL_H
+#define E_ACSL_TEMPORAL_H
 
 #include "e_acsl_temporal_timestamp.h"
 
@@ -158,3 +160,4 @@ int temporal_valid(void *ptr, void *addr_of_ptr) {
 #else
 #  define E_ACSL_TEMPORAL_DESC "disabled"
 #endif
+#endif
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal_timestamp.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal_timestamp.h
index 38728ca73d7..40b7a006c17 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal_timestamp.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_temporal_timestamp.h
@@ -25,8 +25,8 @@
  * \brief Generating temporal timestamps
 ***************************************************************************/
 
-#ifndef E_ACSL_TEMPORAL_TIMESTAMP /*{{{*/
-#define E_ACSL_TEMPORAL_TIMESTAMP
+#ifndef E_ACSL_TEMPORAL_TIMESTAMP_H /*{{{*/
+#define E_ACSL_TEMPORAL_TIMESTAMP_H
 
 #include <stdint.h>
 
diff --git a/src/plugins/e-acsl/share/e-acsl/e_acsl_trace.h b/src/plugins/e-acsl/share/e-acsl/e_acsl_trace.h
index 0c6a3fda520..a8a46fffe16 100644
--- a/src/plugins/e-acsl/share/e-acsl/e_acsl_trace.h
+++ b/src/plugins/e-acsl/share/e-acsl/e_acsl_trace.h
@@ -25,8 +25,8 @@
  * \brief Interface for producing backtrace. Requires GLIBC.
 ***************************************************************************/
 
-#ifndef E_ACSL_TRACE
-#define E_ACSL_TRACE
+#ifndef E_ACSL_TRACE_H
+#define E_ACSL_TRACE_H
 
 #include <stddef.h>
 #include <limits.h>
-- 
GitLab