Correct some multiple inclusion guard defines

diff --git a/source/3d/axle.h b/source/3d/axle.h
index 6335b9f8e30cef023c4ae9f35592eba56e0ba79f..e53efb2c97b52d99dfb5ba3b0273b5980927bd05 100644 (file)
--- a/source/3d/axle.h
+++ b/source/3d/axle.h
@@ -1,5 +1,5 @@
-#ifndef LIBR2C23D_AXLE_H_
-#define LIBR2C23D_AXLE_H_
+#ifndef R2C2_3D_AXLE_H_
+#define R2C2_3D_AXLE_H_
 
 #include <msp/gl/objectinstance.h>
 #include "libr2c2/vehicle.h"

diff --git a/source/3d/bogie.h b/source/3d/bogie.h
index 2b3ade3c645f8113fd6c4538a06525caddcd969c..7b6dbfc9540e8d663b922c6b81a2f0da95d70fa9 100644 (file)
--- a/source/3d/bogie.h
+++ b/source/3d/bogie.h
@@ -1,5 +1,5 @@
-#ifndef LIBR2C23D_BOGIE_H_
-#define LIBR2C23D_BOGIE_H_
+#ifndef R2C2_3D_BOGIE_H_
+#define R2C2_3D_BOGIE_H_
 
 #include <msp/gl/objectinstance.h>
 #include "libr2c2/vehicle.h"

diff --git a/source/3d/rod.h b/source/3d/rod.h
index 8521468377f67b16136844a6af5f2b888da7db1c..1605caa11394cbf682fcca4d1454601e31f0ad91 100644 (file)
--- a/source/3d/rod.h
+++ b/source/3d/rod.h
@@ -1,5 +1,5 @@
-#ifndef LIBR2C23D_ROD_H_
-#define LIBR2C23D_ROD_H_
+#ifndef R2C2_3D_ROD_H_
+#define R2C2_3D_ROD_H_
 
 #include <msp/gl/objectinstance.h>
 #include "libr2c2/vehicle.h"

diff --git a/source/3d/trackcircuit.h b/source/3d/trackcircuit.h
index ae032b0a05c2cc8099b8c7bac16e5643c3008302..46cf7be46160683516f13259254b62d7cd0811cf 100644 (file)
--- a/source/3d/trackcircuit.h
+++ b/source/3d/trackcircuit.h
@@ -1,5 +1,5 @@
-#ifndef R2C2_TRACKCIRCUIT_H_
-#define R2C2_TRACKCIRCUIT_H_
+#ifndef R2C2_3D_TRACKCIRCUIT_H_
+#define R2C2_3D_TRACKCIRCUIT_H_
 
 #include <libr2c2/trackcircuit.h>
 #include "utility.h"

diff --git a/source/3d/vehicle.h b/source/3d/vehicle.h
index 27b16155f83eff7ea2041131205223613a386c80..919845403f6d54fba3117f3e6342ff674e3ad0c2 100644 (file)
--- a/source/3d/vehicle.h
+++ b/source/3d/vehicle.h
@@ -1,5 +1,5 @@
-#ifndef LIBR2C23D_VEHICLE_H_
-#define LIBR2C23D_VEHICLE_H_
+#ifndef R2C2_3D_VEHICLE_H_
+#define R2C2_3D_VEHICLE_H_
 
 #include <msp/gl/objectinstance.h>
 #include <msp/gl/renderable.h>

diff --git a/source/3d/vehicletype.h b/source/3d/vehicletype.h
index 02d110887a6b729f94f2930b1d86f0dbbf94e107..428a372f58ca313a729df93c21e01ba60f0ef95e 100644 (file)
--- a/source/3d/vehicletype.h
+++ b/source/3d/vehicletype.h
@@ -1,5 +1,5 @@
-#ifndef LIBR2C23D_VEHICLETYPE_H_
-#define LIBR2C23D_VEHICLETYPE_H_
+#ifndef R2C2_3D_VEHICLETYPE_H_
+#define R2C2_3D_VEHICLETYPE_H_
 
 #include <msp/gl/mesh.h>
 #include <msp/gl/object.h>