please sonar with some compliant macro names

diff --git a/include/surf/surf_routing.h b/include/surf/surf_routing.h
index 725f8a1..20384e3 100644 (file)
--- a/include/surf/surf_routing.h
+++ b/include/surf/surf_routing.h
@@ -4,8 +4,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _SURF_SURF_ROUTING_H
-#define _SURF_SURF_ROUTING_H
+#ifndef SURF_SURF_ROUTING_H
+#define SURF_SURF_ROUTING_H
 
 #include "xbt/lib.h"
 

diff --git a/include/xbt.h b/include/xbt.h
index 66e97a7..c30e685 100644 (file)
--- a/include/xbt.h
+++ b/include/xbt.h
@@ -6,8 +6,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef xbt_H
-#define xbt_H
+#ifndef XBT_H
+#define XBT_H
 
 #include <xbt/misc.h>
 #include <xbt/sysdep.h>

diff --git a/include/xbt/asserts.h b/include/xbt/asserts.h
index 30d9a34..b3494cf 100644 (file)
--- a/include/xbt/asserts.h
+++ b/include/xbt/asserts.h
@@ -6,8 +6,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_ASSERTS_H
-#define _XBT_ASSERTS_H
+#ifndef XBT_ASSERTS_H
+#define XBT_ASSERTS_H
 
 #include "xbt/misc.h"
 #include "xbt/log.h"
@@ -49,4 +49,4 @@ XBT_PUBLIC_DATA(int) xbt_log_no_loc; /* Do not show the backtrace on failed back
 
 /** @} */
 SG_END_DECL()
-#endif                          /* _XBT_ASSERTS_H */
+#endif                          /* XBT_ASSERTS_H */

diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h
index 6b8be48..1ba708f 100644 (file)
--- a/include/xbt/automaton.h
+++ b/include/xbt/automaton.h
@@ -4,8 +4,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_AUTOMATON_H
-#define _XBT_AUTOMATON_H
+#ifndef XBT_AUTOMATON_H
+#define XBT_AUTOMATON_H
 
 #include <xbt/dynar.h>
 #include <xbt/sysdep.h>

diff --git a/include/xbt/backtrace.h b/include/xbt/backtrace.h
index 508cbc5..90df0a3 100644 (file)
--- a/include/xbt/backtrace.h
+++ b/include/xbt/backtrace.h
@@ -1,7 +1,7 @@
 /* Copyright (c) 2005-2016. The SimGrid Team. All rights reserved.          */
 
-#ifndef SIMGRIX_XBT_BACKTRACE_H
-#define SIMGRIX_XBT_BACKTRACE_H
+#ifndef XBT_BACKTRACE_H
+#define XBT_BACKTRACE_H
 
 #include <cstddef>
 

diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index 16b1d64..6307177 100644 (file)
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -40,8 +40,8 @@
 /* The extensions made for the SimGrid project can either be distributed    */
 /* under the same license, or under the LGPL v2.1                           */
 
-#ifndef __XBT_EX_H__
-#define __XBT_EX_H__
+#ifndef XBT_EX_H
+#define XBT_EX_H
 
 #include <stdlib.h>
 

diff --git a/include/xbt/heap.h b/include/xbt/heap.h
index 89ee7d1..7e4ea84 100644 (file)
--- a/include/xbt/heap.h
+++ b/include/xbt/heap.h
@@ -4,8 +4,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_HEAP_H
-#define _XBT_HEAP_H
+#ifndef XBT_HEAP_H
+#define XBT_HEAP_H
 
 #include "xbt/misc.h"
 #include "xbt/dynar.h"          /* void_f_pvoid_t */

diff --git a/include/xbt/lib.h b/include/xbt/lib.h
index 15553e3..56a9007 100644 (file)
--- a/include/xbt/lib.h
+++ b/include/xbt/lib.h
@@ -6,8 +6,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_LIB_H
-#define _XBT_LIB_H
+#ifndef XBT_LIB_H
+#define XBT_LIB_H
 
 #include <xbt/dict.h>
 

diff --git a/include/xbt/log.h b/include/xbt/log.h
index 4c24f32..3ec9eb4 100644 (file)
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -25,8 +25,8 @@
    printf function. Useful to debug the logging facilities themselves, or to not make source analysis tools mad */
 //#define XBT_LOG_MAYDAY
 
-#ifndef _XBT_LOG_H_
-#define _XBT_LOG_H_
+#ifndef XBT_LOG_H
+#define XBT_LOG_H
 
 #include "xbt/misc.h"
 #include <stdarg.h>

diff --git a/include/xbt/mallocator.h b/include/xbt/mallocator.h
index a114cdf..e607e10 100644 (file)
--- a/include/xbt/mallocator.h
+++ b/include/xbt/mallocator.h
@@ -6,8 +6,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_MALLOCATOR_H
-#define _XBT_MALLOCATOR_H
+#ifndef XBT_MALLOCATOR_H
+#define XBT_MALLOCATOR_H
 
 #include "xbt/function_types.h"
 #include "xbt/misc.h"

diff --git a/include/xbt/module.h b/include/xbt/module.h
index 7e00a6f..ba5b03f 100644 (file)
--- a/include/xbt/module.h
+++ b/include/xbt/module.h
@@ -5,8 +5,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_MODULE_H
-#define _XBT_MODULE_H
+#ifndef XBT_MODULE_H
+#define XBT_MODULE_H
 
 #include <xbt/misc.h>           /* XBT_PUBLIC */
 

diff --git a/include/xbt/parmap.h b/include/xbt/parmap.h
index 15257b5..89a8434 100644 (file)
--- a/include/xbt/parmap.h
+++ b/include/xbt/parmap.h
@@ -6,8 +6,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_PARMAP_H
-#define _XBT_PARMAP_H
+#ifndef XBT_PARMAP_H
+#define XBT_PARMAP_H
 
 #include "xbt/misc.h"           /* SG_BEGIN_DECL */
 #include "xbt/function_types.h"

diff --git a/include/xbt/synchro.h b/include/xbt/synchro.h
index d0664f9..340ef71 100644 (file)
--- a/include/xbt/synchro.h
+++ b/include/xbt/synchro.h
@@ -5,8 +5,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_THREAD_H
-#define _XBT_THREAD_H
+#ifndef XBT_THREAD_H
+#define XBT_THREAD_H
 
 #include <simgrid/simix.h>
 

diff --git a/include/xbt/sysdep.h b/include/xbt/sysdep.h
index 82f2c24..fac49a7 100644 (file)
--- a/include/xbt/sysdep.h
+++ b/include/xbt/sysdep.h
@@ -8,8 +8,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_SYSDEP_H
-#define _XBT_SYSDEP_H
+#ifndef XBT_SYSDEP_H
+#define XBT_SYSDEP_H
 
 #include "xbt/log.h"
 #include "xbt/misc.h"
@@ -136,4 +136,4 @@ SG_END_DECL()
 
 /** @} */
 
-#endif                          /* _XBT_SYSDEP_H */
+#endif                          /* XBT_SYSDEP_H */

diff --git a/include/xbt/xbt_os_time.h b/include/xbt/xbt_os_time.h
index 0d3fa3c..47f33be 100644 (file)
--- a/include/xbt/xbt_os_time.h
+++ b/include/xbt/xbt_os_time.h
@@ -5,8 +5,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifndef _XBT_OS_TIMER_H
-#define _XBT_OS_TIMER_H
+#ifndef XBT_OS_TIMER_H
+#define XBT_OS_TIMER_H
 
 #include <xbt/misc.h>           /* XBT_PUBLIC */
 #include <stddef.h>             /* size_t */