Replace include guards with pragma once

LWJGL · Aug 24, 2016 · f5ae4f4 · f5ae4f4
1 parent adf33bb
commit f5ae4f4
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 89 deletions.
diff --git a/modules/core/src/main/include/system/common_tools.h b/modules/core/src/main/include/system/common_tools.h
@@ -2,8 +2,7 @@
  * Copyright LWJGL. All rights reserved.
  * License terms: https://www.lwjgl.org/license
  */
-#ifndef __LWJGL_COMMON_TOOLS_H__
-#define __LWJGL_COMMON_TOOLS_H__
+#pragma once
 
 #ifdef LWJGL_WINDOWS
 	#include "WindowsConfig.h"
@@ -63,5 +62,3 @@ extern void detachCurrentThread(void);
 	(void)(b);
 
 // -----------------------------------------------------
-
-#endif
diff --git a/modules/core/src/main/include/system/linux/LinuxLWJGL.h b/modules/core/src/main/include/system/linux/LinuxLWJGL.h
@@ -2,9 +2,7 @@
  * Copyright LWJGL. All rights reserved.
  * License terms: https://www.lwjgl.org/license
  */
-#ifndef _LINUX_LWJGL_INCLUDED
-	#define _LINUX_LWJGL_INCLUDED
+#pragma once
 
-	#include <X11/X.h>
-	#include <X11/Xlib.h>
-#endif
+#include <X11/X.h>
+#include <X11/Xlib.h>
diff --git a/modules/core/src/main/include/system/lwjgl_malloc.h b/modules/core/src/main/include/system/lwjgl_malloc.h
@@ -2,8 +2,7 @@
  * Copyright LWJGL. All rights reserved.
  * License terms: https://www.lwjgl.org/license
  */
-#ifndef __LWJGL_MALLOC_H__
-#define __LWJGL_MALLOC_H__
+#pragma once
 
 // Overridable memory management functions
 
@@ -61,5 +60,3 @@ XSETUP_MALLOC(LWJGL_MALLOC_LIB)
 
 EXTERN_C_EXIT
 #endif
-
-#endif
diff --git a/modules/core/src/main/include/system/macosx/MacOSXLWJGL.h b/modules/core/src/main/include/system/macosx/MacOSXLWJGL.h
@@ -2,8 +2,6 @@
  * Copyright LWJGL. All rights reserved.
  * License terms: https://www.lwjgl.org/license
  */
-#ifndef _MACOSX_LWJGL_INCLUDED
-	#define _MACOSX_LWJGL_INCLUDED
+#pragma once
 
-	#include <CoreFoundation/CoreFoundation.h>
-#endif
+#include <CoreFoundation/CoreFoundation.h>
diff --git a/modules/core/src/main/include/system/windows/WindowsLWJGL.h b/modules/core/src/main/include/system/windows/WindowsLWJGL.h
@@ -2,82 +2,80 @@
  * Copyright LWJGL. All rights reserved.
  * License terms: https://www.lwjgl.org/license
  */
-#ifndef _WINDOWS_LWJGL_INCLUDED
-	#define _WINDOWS_LWJGL_INCLUDED
+#pragma once
 
-	#ifndef VC_EXTRALEAN
-		#define VC_EXTRALEAN
-	#endif
+#ifndef VC_EXTRALEAN
+	#define VC_EXTRALEAN
+#endif
 
-	#ifndef WIN32_LEAN_AND_MEAN
-		#define WIN32_LEAN_AND_MEAN
-	#endif
+#ifndef WIN32_LEAN_AND_MEAN
+	#define WIN32_LEAN_AND_MEAN
+#endif
 
-	#ifndef _WIN32_WINDOWS
-		#define _WIN32_WINDOWS 0x0500
-	#endif
+#ifndef _WIN32_WINDOWS
+	#define _WIN32_WINDOWS 0x0500
+#endif
 
-	#ifndef WINVER
-		#define WINVER 0x0500
-	#endif
+#ifndef WINVER
+	#define WINVER 0x0500
+#endif
 
-	#ifndef _WIN32_WINNT
-		#define _WIN32_WINNT 0x0500
-	#endif
+#ifndef _WIN32_WINNT
+	#define _WIN32_WINNT 0x0500
+#endif
 
-	#ifndef UNICODE
-		#define UNICODE
-	#endif
+#ifndef UNICODE
+	#define UNICODE
+#endif
 
-	#ifndef _UNICODE
-		#define _UNICODE
-	#endif
+#ifndef _UNICODE
+	#define _UNICODE
+#endif
 
-	// Disable optional features we don't need.
+// Disable optional features we don't need.
 
-	#define NOGDICAPMASKS // CC_*, LC_*, PC_*, CP_*, TC_*, RC_
-	#define NOVIRTUALKEYCODES // VK_*
-	#define NOWINMESSAGES // WM_*, EM_*, LB_*, CB_*
-	#define NOWINSTYLES // WS_*, CS_*, ES_*, LBS_*, SBS_*, CBS_*
-	#define NOSYSMETRICS // SM_*
-	#define NOMENUS // MF_*
-	#define NOICONS // IDI_*
-	#define NOKEYSTATES // MK_*
-	#define NOSYSCOMMANDS // SC_*
-	#define NORASTEROPS // Binary and Tertiary raster ops
-	#define NOSHOWWINDOW // SW_*
-	#define OEMRESOURCE // OEM Resource values
-	#define NOATOM // Atom Manager routines
-	#define NOCLIPBOARD // Clipboard routines
-	#define NOCOLOR // Screen colors
-	#define NOCTLMGR // Control and Dialog routines
-	#define NODRAWTEXT // DrawText() and DT_*
-	#define NOGDI // All GDI defines and routines
-	#define NOKERNEL // All KERNEL defines and routines
-	#define NOUSER // All USER defines and routines
-	#define NONLS // All NLS defines and routines
-	#define NOMB // MB_* and MessageBox()
-	#define NOMEMMGR // GMEM_*, LMEM_*, GHND, LHND, associated routines
-	#define NOMETAFILE // typedef METAFILEPICT
-	#define NOMINMAX // Macros min(a,b) and max(a,b)
-	#define NOMSG // typedef MSG and associated routines
-	#define NOOPENFILE // OpenFile(), OemToAnsi, AnsiToOem, and OF_*
-	#define NOSCROLL // SB_* and scrolling routines
-	#define NOSERVICE // All Service Controller routines, SERVICE_ equates, etc.
-	#define NOSOUND // Sound driver routines
-	#define NOTEXTMETRIC // typedef TEXTMETRIC and associated routines
-	#define NOWH // SetWindowsHook and WH_*
-	#define NOWINOFFSETS // GWL_*, GCL_*, associated routines
-	#define NOCOMM // COMM driver routines
-	#define NOKANJI // Kanji support stuff.
-	#define NOHELP // Help engine interface.
-	#define NOPROFILER // Profiler interface.
-	#define NODEFERWINDOWPOS // DeferWindowPos routines
-	#define NOMCX // Modem Configuration Extensions
+#define NOGDICAPMASKS // CC_*, LC_*, PC_*, CP_*, TC_*, RC_
+#define NOVIRTUALKEYCODES // VK_*
+#define NOWINMESSAGES // WM_*, EM_*, LB_*, CB_*
+#define NOWINSTYLES // WS_*, CS_*, ES_*, LBS_*, SBS_*, CBS_*
+#define NOSYSMETRICS // SM_*
+#define NOMENUS // MF_*
+#define NOICONS // IDI_*
+#define NOKEYSTATES // MK_*
+#define NOSYSCOMMANDS // SC_*
+#define NORASTEROPS // Binary and Tertiary raster ops
+#define NOSHOWWINDOW // SW_*
+#define OEMRESOURCE // OEM Resource values
+#define NOATOM // Atom Manager routines
+#define NOCLIPBOARD // Clipboard routines
+#define NOCOLOR // Screen colors
+#define NOCTLMGR // Control and Dialog routines
+#define NODRAWTEXT // DrawText() and DT_*
+#define NOGDI // All GDI defines and routines
+#define NOKERNEL // All KERNEL defines and routines
+#define NOUSER // All USER defines and routines
+#define NONLS // All NLS defines and routines
+#define NOMB // MB_* and MessageBox()
+#define NOMEMMGR // GMEM_*, LMEM_*, GHND, LHND, associated routines
+#define NOMETAFILE // typedef METAFILEPICT
+#define NOMINMAX // Macros min(a,b) and max(a,b)
+#define NOMSG // typedef MSG and associated routines
+#define NOOPENFILE // OpenFile(), OemToAnsi, AnsiToOem, and OF_*
+#define NOSCROLL // SB_* and scrolling routines
+#define NOSERVICE // All Service Controller routines, SERVICE_ equates, etc.
+#define NOSOUND // Sound driver routines
+#define NOTEXTMETRIC // typedef TEXTMETRIC and associated routines
+#define NOWH // SetWindowsHook and WH_*
+#define NOWINOFFSETS // GWL_*, GCL_*, associated routines
+#define NOCOMM // COMM driver routines
+#define NOKANJI // Kanji support stuff.
+#define NOHELP // Help engine interface.
+#define NOPROFILER // Profiler interface.
+#define NODEFERWINDOWPOS // DeferWindowPos routines
+#define NOMCX // Modem Configuration Extensions
 
-    #define STRICT
+#define STRICT
 
-    DISABLE_WARNINGS()
-	#include <windows.h>
-	ENABLE_WARNINGS()
-#endif /* _WINDOWS_LWJGL_INCLUDED */
+DISABLE_WARNINGS()
+#include <windows.h>
+ENABLE_WARNINGS()
diff --git a/modules/core/src/main/include/util/simd/intrinsics.h b/modules/core/src/main/include/util/simd/intrinsics.h
@@ -2,8 +2,7 @@
  * Copyright LWJGL. All rights reserved.
  * License terms: https://www.lwjgl.org/license
  */
-#ifndef __LWJGL_SIMD_INTRINSICS_H__
-#define __LWJGL_SIMD_INTRINSICS_H__
+#pragma once
 
 #if defined(_MSC_VER)
 	/* Microsoft C/C++-compatible compiler */
@@ -26,5 +25,3 @@
 	/* GCC-compatible compiler, targeting PowerPC with SPE */
 	#include <spe.h>
 #endif
-
-#endif