[Scummvm-git-logs] scummvm master -> 3a67525ac6706cbace544b67a8db08116116ab9c

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3a67525ac6 WINTERMUTE: Cleanup include guard names


Commit: 3a67525ac6706cbace544b67a8db08116116ab9c
    https://github.com/scummvm/scummvm/commit/3a67525ac6706cbace544b67a8db08116116ab9c
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-09-04T12:10:52+02:00

Commit Message:
WINTERMUTE: Cleanup include guard names

Changed paths:
    engines/wintermute/base/gfx/opengl/meshx_opengl.h
    engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
    engines/wintermute/base/gfx/xframe_node.h
    engines/wintermute/base/gfx/xmaterial.h
    engines/wintermute/base/gfx/xmesh.h
    engines/wintermute/base/gfx/xmodel.h


diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl.h b/engines/wintermute/base/gfx/opengl/meshx_opengl.h
index a9770ada750..952938b6229 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl.h
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl.h
@@ -25,8 +25,8 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#ifndef WINTERMUTE_MESH_X_OPENGL_H
-#define WINTERMUTE_MESH_X_OPENGL_H
+#ifndef WINTERMUTE_XMESH_OPENGL_H
+#define WINTERMUTE_XMESH_OPENGL_H
 
 #include "engines/wintermute/base/gfx/xmesh.h"
 
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
index c7e5b6c98c0..9e35545392f 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
@@ -25,8 +25,8 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#ifndef WINTERMUTE_MESH_X_OPENGL_SHADER_H
-#define WINTERMUTE_MESH_X_OPENGL_SHADER_H
+#ifndef WINTERMUTE_XMESH_OPENGL_SHADER_H
+#define WINTERMUTE_XMESH_OPENGL_SHADER_H
 
 #include "engines/wintermute/base/gfx/xmesh.h"
 
diff --git a/engines/wintermute/base/gfx/xframe_node.h b/engines/wintermute/base/gfx/xframe_node.h
index 7a728180f86..933f62bfe17 100644
--- a/engines/wintermute/base/gfx/xframe_node.h
+++ b/engines/wintermute/base/gfx/xframe_node.h
@@ -25,8 +25,8 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#ifndef WINTERMUTE_FRAME_NODE_H
-#define WINTERMUTE_FRAME_NODE_H
+#ifndef WINTERMUTE_XFRAME_NODE_H
+#define WINTERMUTE_XFRAME_NODE_H
 
 #include "engines/wintermute/base/base_named_object.h"
 #include "engines/wintermute/base/gfx/xmesh.h"
diff --git a/engines/wintermute/base/gfx/xmaterial.h b/engines/wintermute/base/gfx/xmaterial.h
index 41d3bef5114..566cff160e3 100644
--- a/engines/wintermute/base/gfx/xmaterial.h
+++ b/engines/wintermute/base/gfx/xmaterial.h
@@ -25,8 +25,8 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#ifndef WINTERMUTE_MATERIAL_H
-#define WINTERMUTE_MATERIAL_H
+#ifndef WINTERMUTE_XMATERIAL_H
+#define WINTERMUTE_XMATERIAL_H
 
 #include "engines/wintermute/base/base_named_object.h"
 
diff --git a/engines/wintermute/base/gfx/xmesh.h b/engines/wintermute/base/gfx/xmesh.h
index 6c2a6ac0658..3de79ed2cac 100644
--- a/engines/wintermute/base/gfx/xmesh.h
+++ b/engines/wintermute/base/gfx/xmesh.h
@@ -25,8 +25,8 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#ifndef WINTERMUTE_MESH_X_H
-#define WINTERMUTE_MESH_X_H
+#ifndef WINTERMUTE_XMESH_H
+#define WINTERMUTE_XMESH_H
 
 #include "engines/wintermute/base/base_named_object.h"
 #include "engines/wintermute/base/gfx/xmodel.h"
diff --git a/engines/wintermute/base/gfx/xmodel.h b/engines/wintermute/base/gfx/xmodel.h
index 368426a49eb..e2e615f17fd 100644
--- a/engines/wintermute/base/gfx/xmodel.h
+++ b/engines/wintermute/base/gfx/xmodel.h
@@ -25,8 +25,8 @@
  * Copyright (c) 2003-2013 Jan Nedoma and contributors
  */
 
-#ifndef WINTERMUTE_MODEL_X_H
-#define WINTERMUTE_MODEL_X_H
+#ifndef WINTERMUTE_XMODEL_H
+#define WINTERMUTE_XMODEL_H
 
 #include "engines/wintermute/base/base_object.h"
 #include "engines/wintermute/base/base_sprite.h"