aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAwkor <awkor.16+github@gmail.com>2020-05-23 13:23:05 +0200
committerGitHub <noreply@github.com>2020-05-23 13:23:05 +0200
commit037422fdba9a47bd538480988fbf8aad67d66c85 (patch)
treeb206910fbe0112dd9968d62c48f5f2b0fc34b84d
parente79bc40c0a5312baf4e8c3e33048d50b41b4a2ff (diff)
downloadminetest-037422fdba9a47bd538480988fbf8aad67d66c85.tar.gz
minetest-037422fdba9a47bd538480988fbf8aad67d66c85.tar.bz2
minetest-037422fdba9a47bd538480988fbf8aad67d66c85.zip
Modernize include guards and add missing ones (#9898)
-rw-r--r--src/client/hud.h4
-rw-r--r--src/client/render/factory.h2
-rw-r--r--src/gui/guiButtonImage.h2
-rw-r--r--src/gui/guiButtonItemImage.h2
-rw-r--r--src/hud.h4
-rw-r--r--src/script/lua_api/l_particles_local.h2
-rw-r--r--src/util/md32_common.h2
7 files changed, 12 insertions, 6 deletions
diff --git a/src/client/hud.h b/src/client/hud.h
index 6274b1a83..e2abf326c 100644
--- a/src/client/hud.h
+++ b/src/client/hud.h
@@ -18,8 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef CLIENT_HUD_HEADER
-#define CLIENT_HUD_HEADER
+#pragma once
#include <vector>
#include <IGUIFont.h>
@@ -147,4 +146,3 @@ void drawItemStack(
const v3s16 &angle,
const v3s16 &rotation_speed);
-#endif
diff --git a/src/client/render/factory.h b/src/client/render/factory.h
index 22738404a..e3339a836 100644
--- a/src/client/render/factory.h
+++ b/src/client/render/factory.h
@@ -18,6 +18,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#pragma once
+
#include <string>
#include "core.h"
diff --git a/src/gui/guiButtonImage.h b/src/gui/guiButtonImage.h
index a948d772b..59a25b4f0 100644
--- a/src/gui/guiButtonImage.h
+++ b/src/gui/guiButtonImage.h
@@ -17,6 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#pragma once
+
#include "guiButton.h"
#include "IGUIButton.h"
diff --git a/src/gui/guiButtonItemImage.h b/src/gui/guiButtonItemImage.h
index 9cd0f6188..aad923bda 100644
--- a/src/gui/guiButtonItemImage.h
+++ b/src/gui/guiButtonItemImage.h
@@ -17,6 +17,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#pragma once
+
#include "guiButton.h"
#include "IGUIButton.h"
diff --git a/src/hud.h b/src/hud.h
index bab420ed2..e015baec1 100644
--- a/src/hud.h
+++ b/src/hud.h
@@ -18,8 +18,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifndef HUD_HEADER
-#define HUD_HEADER
+#pragma once
#include "irrlichttypes_extrabloated.h"
#include <string>
@@ -101,4 +100,3 @@ extern const EnumString es_HudElementType[];
extern const EnumString es_HudElementStat[];
extern const EnumString es_HudBuiltinElement[];
-#endif
diff --git a/src/script/lua_api/l_particles_local.h b/src/script/lua_api/l_particles_local.h
index 5dff153b3..d8bb2b1c6 100644
--- a/src/script/lua_api/l_particles_local.h
+++ b/src/script/lua_api/l_particles_local.h
@@ -18,6 +18,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#pragma once
+
#include "lua_api/l_base.h"
class ModApiParticlesLocal : public ModApiBase
diff --git a/src/util/md32_common.h b/src/util/md32_common.h
index 085d1d7a5..a4c2099c9 100644
--- a/src/util/md32_common.h
+++ b/src/util/md32_common.h
@@ -109,6 +109,8 @@
* <appro@fy.chalmers.se>
*/
+#pragma once
+
#if !defined(DATA_ORDER_IS_BIG_ENDIAN) && !defined(DATA_ORDER_IS_LITTLE_ENDIAN)
# error "DATA_ORDER must be defined!"
#endif