From 2af6e06380abef533322cb7dab1237eeb7b6b132 Mon Sep 17 00:00:00 2001
From: Hugues Delorme <delorme.hugues@fougsys.fr>
Date: Thu, 2 Apr 2015 10:41:41 +0200
Subject: [PATCH] gmio_stl,support: better consistency of double-inclusion
 guard macros

---
 src/gmio_stl/stl_error.h          | 6 +++---
 src/gmio_stl/stl_format.h         | 6 +++---
 src/gmio_stl/stl_global.h         | 6 +++---
 src/gmio_stl/stl_io.h             | 6 +++---
 src/gmio_stl/stl_mesh.h           | 6 +++---
 src/gmio_stl/stl_mesh_creator.h   | 6 +++---
 src/gmio_stl/stl_triangle.h       | 6 +++---
 src/gmio_support/support_global.h | 6 +++---
 8 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/gmio_stl/stl_error.h b/src/gmio_stl/stl_error.h
index 0d94885..5236917 100644
--- a/src/gmio_stl/stl_error.h
+++ b/src/gmio_stl/stl_error.h
@@ -17,8 +17,8 @@
  *  List of errors specific to STL I/O functions
  */
 
-#ifndef GMIO_LIBSTL_STL_ERROR_H
-#define GMIO_LIBSTL_STL_ERROR_H
+#ifndef GMIO_STL_ERROR_H
+#define GMIO_STL_ERROR_H
 
 /*! A byte-mask to tag(identify) STL-specific error codes */
 enum { GMIO_STL_ERROR_TAG = 0x11000000 };
@@ -60,4 +60,4 @@ enum gmio_stl_error
 
 typedef enum gmio_stl_error  gmio_stl_error_t;
 
-#endif /* GMIO_LIBSTL_STL_ERROR_H */
+#endif /* GMIO_STL_ERROR_H */
diff --git a/src/gmio_stl/stl_format.h b/src/gmio_stl/stl_format.h
index b0c199f..15ad658 100644
--- a/src/gmio_stl/stl_format.h
+++ b/src/gmio_stl/stl_format.h
@@ -17,8 +17,8 @@
  *  Detection of STL format from input stream
  */
 
-#ifndef GMIO_LIBSTL_FORMAT_H
-#define GMIO_LIBSTL_FORMAT_H
+#ifndef GMIO_STL_FORMAT_H
+#define GMIO_STL_FORMAT_H
 
 #include "stl_global.h"
 #include "../gmio_core/stream.h"
@@ -48,4 +48,4 @@ gmio_stl_format_t gmio_stl_get_format(gmio_stream_t* stream);
 
 GMIO_C_LINKAGE_END
 
-#endif /* GMIO_LIBSTL_FORMAT_H */
+#endif /* GMIO_STL_FORMAT_H */
diff --git a/src/gmio_stl/stl_global.h b/src/gmio_stl/stl_global.h
index fe721dd..a1e8035 100644
--- a/src/gmio_stl/stl_global.h
+++ b/src/gmio_stl/stl_global.h
@@ -17,8 +17,8 @@
  *  Global declarations for the STL module
  */
 
-#ifndef GMIO_LIBSTL_GLOBAL_H
-#define GMIO_LIBSTL_GLOBAL_H
+#ifndef GMIO_STL_GLOBAL_H
+#define GMIO_STL_GLOBAL_H
 
 #include "../gmio_core/global.h"
 
@@ -44,4 +44,4 @@ enum {
     GMIO_STLB_MIN_CONTENTS_SIZE = 284
 };
 
-#endif /* GMIO_LIBSTL_GLOBAL_H */
+#endif /* GMIO_STL_GLOBAL_H */
diff --git a/src/gmio_stl/stl_io.h b/src/gmio_stl/stl_io.h
index cbde2d6..2821c84 100644
--- a/src/gmio_stl/stl_io.h
+++ b/src/gmio_stl/stl_io.h
@@ -17,8 +17,8 @@
  *  STL read/write functions
  */
 
-#ifndef GMIO_LIBSTL_STL_IO_H
-#define GMIO_LIBSTL_STL_IO_H
+#ifndef GMIO_STL_IO_H
+#define GMIO_STL_IO_H
 
 #include "stl_global.h"
 #include "stl_mesh.h"
@@ -176,4 +176,4 @@ int gmio_stlb_write(
 
 GMIO_C_LINKAGE_END
 
-#endif /* GMIO_LIBSTL_STL_IO_H */
+#endif /* GMIO_STL_IO_H */
diff --git a/src/gmio_stl/stl_mesh.h b/src/gmio_stl/stl_mesh.h
index 58fc57f..102e964 100644
--- a/src/gmio_stl/stl_mesh.h
+++ b/src/gmio_stl/stl_mesh.h
@@ -17,8 +17,8 @@
  *  Declaration of gmio_stl_mesh
  */
 
-#ifndef GMIO_LIBSTL_STL_MESH_H
-#define GMIO_LIBSTL_STL_MESH_H
+#ifndef GMIO_STL_MESH_H
+#define GMIO_STL_MESH_H
 
 #include "stl_global.h"
 #include "stl_triangle.h"
@@ -41,4 +41,4 @@ struct gmio_stl_mesh
 
 typedef struct gmio_stl_mesh gmio_stl_mesh_t;
 
-#endif /* GMIO_LIBSTL_STL_MESH_H */
+#endif /* GMIO_STL_MESH_H */
diff --git a/src/gmio_stl/stl_mesh_creator.h b/src/gmio_stl/stl_mesh_creator.h
index a2671a4..61a3df3 100644
--- a/src/gmio_stl/stl_mesh_creator.h
+++ b/src/gmio_stl/stl_mesh_creator.h
@@ -17,8 +17,8 @@
  *  Declaration of gmio_stl_mesh_creator
  */
 
-#ifndef GMIO_LIBSTL_STL_MESH_CREATOR_H
-#define GMIO_LIBSTL_STL_MESH_CREATOR_H
+#ifndef GMIO_STL_MESH_CREATOR_H
+#define GMIO_STL_MESH_CREATOR_H
 
 #include "stl_global.h"
 #include "stl_triangle.h"
@@ -73,4 +73,4 @@ struct gmio_stl_mesh_creator
 
 typedef struct gmio_stl_mesh_creator gmio_stl_mesh_creator_t;
 
-#endif /* GMIO_LIBSTL_STL_MESH_CREATOR_H */
+#endif /* GMIO_STL_MESH_CREATOR_H */
diff --git a/src/gmio_stl/stl_triangle.h b/src/gmio_stl/stl_triangle.h
index e0c0b9d..587798a 100644
--- a/src/gmio_stl/stl_triangle.h
+++ b/src/gmio_stl/stl_triangle.h
@@ -17,8 +17,8 @@
  *  Declaration of gmio_stl_coords and gmio_stl_triangle
  */
 
-#ifndef GMIO_LIBSTL_TRIANGLE_H
-#define GMIO_LIBSTL_TRIANGLE_H
+#ifndef GMIO_STL_TRIANGLE_H
+#define GMIO_STL_TRIANGLE_H
 
 #include "stl_global.h"
 
@@ -58,4 +58,4 @@ enum {
     GMIO_STLB_TRIANGLE_RAWSIZE = (GMIO_STLA_TRIANGLE_RAWSIZE + sizeof(uint16_t))
 };
 
-#endif /* GMIO_LIBSTL_TRIANGLE_H */
+#endif /* GMIO_STL_TRIANGLE_H */
diff --git a/src/gmio_support/support_global.h b/src/gmio_support/support_global.h
index 12f7de1..01653dc 100644
--- a/src/gmio_support/support_global.h
+++ b/src/gmio_support/support_global.h
@@ -13,8 +13,8 @@
 ** "http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html".
 ****************************************************************************/
 
-#ifndef GMIO_C_SUPPORT_GLOBAL_H
-#define GMIO_C_SUPPORT_GLOBAL_H
+#ifndef GMIO_SUPPORT_GLOBAL_H
+#define GMIO_SUPPORT_GLOBAL_H
 
 #include "../gmio_core/global.h"
 
@@ -28,4 +28,4 @@
 #  define GMIO_LIBSUPPORT_EXPORT
 #endif /* GMIO_LIBSUPPORT_DLL */
 
-#endif /* GMIO_C_SUPPORT_GLOBAL_H */
+#endif /* GMIO_SUPPORT_GLOBAL_H */