Get rid of underscore defines. They are reserved by the standard.

apps/openmw/mwinput/inputmanagerimp.hpp

@@ -1,5 +1,5 @@
-#ifndef _MWINPUT_MWINPUTMANAGERIMP_H
-#define _MWINPUT_MWINPUTMANAGERIMP_H
+#ifndef MWINPUT_MWINPUTMANAGERIMP_H
+#define MWINPUT_MWINPUTMANAGERIMP_H
 
 #include "../mwgui/mode.hpp"
 

apps/openmw/mwrender/activatoranimation.hpp

@@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_ACTIVATORANIMATION_H
-#define _GAME_RENDER_ACTIVATORANIMATION_H
+#ifndef GAME_RENDER_ACTIVATORANIMATION_H
+#define GAME_RENDER_ACTIVATORANIMATION_H
 
 #include "animation.hpp"
 

apps/openmw/mwrender/actors.hpp

@@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_ACTORS_H
-#define _GAME_RENDER_ACTORS_H
+#ifndef GAME_RENDER_ACTORS_H
+#define GAME_RENDER_ACTORS_H
 
 #include <openengine/ogre/renderer.hpp>
 

apps/openmw/mwrender/animation.hpp

@@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_ANIMATION_H
-#define _GAME_RENDER_ANIMATION_H
+#ifndef GAME_RENDER_ANIMATION_H
+#define GAME_RENDER_ANIMATION_H
 
 #include <OgreController.h>
 #include <OgreVector3.h>

apps/openmw/mwrender/creatureanimation.hpp

@@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_CREATUREANIMATION_H
-#define _GAME_RENDER_CREATUREANIMATION_H
+#ifndef GAME_RENDER_CREATUREANIMATION_H
+#define GAME_RENDER_CREATUREANIMATION_H
 
 #include "animation.hpp"
 

apps/openmw/mwrender/debugging.hpp

@@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_MWSCENE_H
-#define _GAME_RENDER_MWSCENE_H
+#ifndef GAME_RENDER_MWSCENE_H
+#define GAME_RENDER_MWSCENE_H
 
 #include <utility>
 #include <openengine/ogre/renderer.hpp>

apps/openmw/mwrender/globalmap.hpp

@@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_GLOBALMAP_H
-#define _GAME_RENDER_GLOBALMAP_H
+#ifndef GAME_RENDER_GLOBALMAP_H
+#define GAME_RENDER_GLOBALMAP_H
 
 #include <string>
 

apps/openmw/mwrender/localmap.hpp

@@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_LOCALMAP_H
-#define _GAME_RENDER_LOCALMAP_H
+#ifndef GAME_RENDER_LOCALMAP_H
+#define GAME_RENDER_LOCALMAP_H
 
 #include <openengine/ogre/renderer.hpp>
 

apps/openmw/mwrender/npcanimation.hpp

@@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_NPCANIMATION_H
-#define _GAME_RENDER_NPCANIMATION_H
+#ifndef GAME_RENDER_NPCANIMATION_H
+#define GAME_RENDER_NPCANIMATION_H
 
 #include "animation.hpp"
 

apps/openmw/mwrender/objects.hpp

@@ -1,5 +1,5 @@
-#ifndef _GAME_RENDER_OBJECTS_H
-#define _GAME_RENDER_OBJECTS_H
+#ifndef GAME_RENDER_OBJECTS_H
+#define GAME_RENDER_OBJECTS_H
 
 #include <OgreColourValue.h>
 #include <OgreAxisAlignedBox.h>

apps/openmw/mwrender/occlusionquery.hpp

@@ -1,5 +1,5 @@
-#ifndef _GAME_OCCLUSION_QUERY_H
-#define _GAME_OCCLUSION_QUERY_H
+#ifndef GAME_OCCLUSION_QUERY_H
+#define GAME_OCCLUSION_QUERY_H
 
 #include <OgreRenderObjectListener.h>
 #include <OgreRenderQueueListener.h>

apps/openmw/mwrender/renderinginterface.hpp

@@ -1,5 +1,5 @@
-#ifndef _GAME_RENDERING_INTERFACE_H
-#define _GAME_RENDERING_INTERFACE_H
+#ifndef GAME_RENDERING_INTERFACE_H
+#define GAME_RENDERING_INTERFACE_H
 
 namespace MWRender
 {

apps/openmw/mwrender/renderingmanager.hpp

@@ -1,5 +1,5 @@
-#ifndef _GAME_RENDERING_MANAGER_H
-#define _GAME_RENDERING_MANAGER_H
+#ifndef GAME_RENDERING_MANAGER_H
+#define GAME_RENDERING_MANAGER_H
 
 #include "sky.hpp"
 #include "debugging.hpp"

components/settings/settings.hpp

@@ -1,5 +1,5 @@
-#ifndef _COMPONENTS_SETTINGS_H
-#define _COMPONENTS_SETTINGS_H
+#ifndef COMPONENTS_SETTINGS_H
+#define COMPONENTS_SETTINGS_H
 
 #include <OgreConfigFile.h>
 

extern/oics/ICSChannel.h

@@ -24,8 +24,8 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ------------------------------------------------------- */
 
-#ifndef _Channel_H_
-#define _Channel_H_
+#ifndef OICS_Channel_H_
+#define OICS_Channel_H_
 
 #include "ICSPrerequisites.h"
 
@@ -119,4 +119,4 @@ namespace ICS
 }
 
 
-#endif
+#endif

extern/oics/ICSControl.h

@@ -24,8 +24,8 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ------------------------------------------------------- */
 
-#ifndef _Control_H_
-#define _Control_H_
+#ifndef OICS_Control_H_
+#define OICS_Control_H_
 
 #include "ICSPrerequisites.h"
 

extern/oics/ICSInputControlSystem.h

@@ -24,8 +24,8 @@ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ------------------------------------------------------- */
 
-#ifndef _InputControlSystem_H_
-#define _InputControlSystem_H_
+#ifndef OICS_InputControlSystem_H_
+#define OICS_InputControlSystem_H_
 
 #include "ICSPrerequisites.h"
 

extern/sdl4ogre/OISCompat.h

@@ -1,5 +1,5 @@
-#ifndef _OIS_SDL_COMPAT_H
-#define _OIS_SDL_COMPAT_H
+#ifndef OIS_SDL_COMPAT_H
+#define OIS_SDL_COMPAT_H
 
 #include <SDL_events.h>
 #include <SDL_types.h>

extern/sdl4ogre/cursormanager.hpp

@@ -1,5 +1,5 @@
-#ifndef _SDL4OGRE_CURSOR_MANAGER_H
-#define _SDL4OGRE_CURSOR_MANAGER_H
+#ifndef SDL4OGRE_CURSOR_MANAGER_H
+#define SDL4OGRE_CURSOR_MANAGER_H
 
 #include <SDL_types.h>
 #include <string>

extern/sdl4ogre/sdlcursormanager.hpp

@@ -1,5 +1,5 @@
-#ifndef _SDL4OGRE_CURSORMANAGER_H
-#define _SDL4OGRE_CURSORMANAGER_H
+#ifndef SDL4OGRE_CURSORMANAGER_H
+#define SDL4OGRE_CURSORMANAGER_H
 
 #include <SDL.h>
 

extern/sdl4ogre/sdlinputwrapper.hpp

@@ -1,5 +1,5 @@
-#ifndef _SDL4OGRE_SDLINPUTWRAPPER_H
-#define _SDL4OGRE_SDLINPUTWRAPPER_H
+#ifndef SDL4OGRE_SDLINPUTWRAPPER_H
+#define SDL4OGRE_SDLINPUTWRAPPER_H
 
 #include <SDL_events.h>
 

libs/openengine/bullet/BtOgreExtras.h

@@ -13,8 +13,8 @@
  * =====================================================================================
  */
 
-#ifndef _BtOgreShapes_H_
-#define _BtOgreShapes_H_
+#ifndef BtOgreShapes_H_
+#define BtOgreShapes_H_
 
 #include "btBulletDynamicsCommon.h"
 #include "OgreSimpleRenderable.h"

libs/openengine/bullet/BtOgreGP.h

@@ -14,8 +14,8 @@
  * =====================================================================================
  */
 
-#ifndef _BtOgrePG_H_
-#define _BtOgrePG_H_
+#ifndef BtOgrePG_H_
+#define BtOgrePG_H_
 
 #include "btBulletDynamicsCommon.h"
 #include "BtOgreExtras.h"

libs/openengine/bullet/BtOgrePG.h

@@ -14,8 +14,8 @@
  * =====================================================================================
  */
 
-#ifndef _BtOgreGP_H_
-#define _BtOgreGP_H_
+#ifndef BtOgreGP_H_
+#define BtOgreGP_H_
 
 #include "btBulletDynamicsCommon.h"
 #include "OgreSceneNode.h"

libs/openengine/bullet/BulletShapeLoader.h

@@ -1,5 +1,5 @@
-#ifndef _BULLET_SHAPE_LOADER_H_
-#define _BULLET_SHAPE_LOADER_H_
+#ifndef OPENMW_BULLET_SHAPE_LOADER_H_
+#define OPENMW_BULLET_SHAPE_LOADER_H_
 
 #include <OgreResource.h>
 #include <OgreResourceManager.h>