common,cli,wrappers,retrace,gui: Use #pragma once.

Smaller footprint, and simplifies refactoring.

12 files changed, 12 insertions, 37 deletions

diff --git a/dispatch/d2dimports.hpp b/dispatch/d2dimports.hpp
index 4a2594b9..ef86dbd6 100644
--- a/dispatch/d2dimports.hpp
+++ b/dispatch/d2dimports.hpp
@@ -27,8 +27,7 @@
  * Central place for all D2D/DWRITE includes, and respective OS dependent headers.
  */
 
-#ifndef _D2DIMPORTS_HPP_
-#define _D2DIMPORTS_HPP_
+#pragma once
 
 #include <windows.h>
 #include <tchar.h>
@@ -95,4 +94,3 @@ DEFINE_GUID(IID_IDWriteGdiInterop,0x1edd9491,0x9853,0x4299,0x89,0x8f,0x64,0x32,0
 DEFINE_GUID(IID_IDWriteGlyphRunAnalysis,0x7d97dbf7,0xe085,0x42d4,0x81,0xe3,0x6a,0x88,0x3b,0xde,0xd1,0x18);
 DEFINE_GUID(IID_IDWriteFactory,0xb859ee5a,0xd838,0x4b5b,0xa2,0xe8,0x1a,0xdc,0x7d,0x93,0xdb,0x48);
 
-#endif /* _D2DIMPORTS_HPP_ */
diff --git a/dispatch/d3d10imports.hpp b/dispatch/d3d10imports.hpp
index 8af79811..80116fe1 100644
--- a/dispatch/d3d10imports.hpp
+++ b/dispatch/d3d10imports.hpp
@@ -27,8 +27,7 @@
  * Central place for all D3D10 includes, and respective OS dependent headers.
  */
 
-#ifndef _D3D10IMPORTS_HPP_
-#define _D3D10IMPORTS_HPP_
+#pragma once
 
 
 #include <windows.h>
@@ -42,4 +41,3 @@
 #include "dxgiint.h"
 
 
-#endif /* _D3D10IMPORTS_HPP_ */
diff --git a/dispatch/d3d11imports.hpp b/dispatch/d3d11imports.hpp
index 410dec41..b7fe3612 100644
--- a/dispatch/d3d11imports.hpp
+++ b/dispatch/d3d11imports.hpp
@@ -27,8 +27,7 @@
  * Central place for all D3D11 includes, and respective OS dependent headers.
  */
 
-#ifndef _D3D11IMPORTS_HPP_
-#define _D3D11IMPORTS_HPP_
+#pragma once
 
 
 #include <windows.h>
@@ -42,4 +41,3 @@
 #include "dxgiint.h"
 
 
-#endif /* _D3D11IMPORTS_HPP_ */
diff --git a/dispatch/d3d8imports.hpp b/dispatch/d3d8imports.hpp
index d0813794..f0fd8814 100644
--- a/dispatch/d3d8imports.hpp
+++ b/dispatch/d3d8imports.hpp
@@ -27,8 +27,7 @@
  * Central place for all D3D8 includes, and respective OS dependent headers.
  */
 
-#ifndef _D3D8IMPORTS_HPP_
-#define _D3D8IMPORTS_HPP_
+#pragma once
 
 #include <windows.h>
 
@@ -36,4 +35,3 @@
 
 #include <d3d8.h>
 
-#endif /* _D3D8IMPORTS_HPP_ */
diff --git a/dispatch/d3d9imports.hpp b/dispatch/d3d9imports.hpp
index b4e81873..675430ba 100644
--- a/dispatch/d3d9imports.hpp
+++ b/dispatch/d3d9imports.hpp
@@ -27,8 +27,7 @@
  * Central place for all D3D9 includes, and respective OS dependent headers.
  */
 
-#ifndef _D3D9IMPORTS_HPP_
-#define _D3D9IMPORTS_HPP_
+#pragma once
 
 #include <windows.h>
 
@@ -99,4 +98,3 @@
 #endif
 
 
-#endif /* _D3D9IMPORTS_HPP_ */
diff --git a/dispatch/d3derr.hpp b/dispatch/d3derr.hpp
index 349cac4f..0b04f216 100644
--- a/dispatch/d3derr.hpp
+++ b/dispatch/d3derr.hpp
@@ -35,8 +35,7 @@
  * - http://msdn.microsoft.com/en-us/library/windows/desktop/bb172554.aspx
  */
 
-#ifndef _D3DERR_HPP_
-#define _D3DERR_HPP_
+#pragma once
 
 
 #ifndef _FACD3D
@@ -95,4 +94,3 @@
 #endif
 
 
-#endif /* _D3DERR_HPP_ */
diff --git a/dispatch/d3dimports.hpp b/dispatch/d3dimports.hpp
index b70e2f4f..69836fe0 100644
--- a/dispatch/d3dimports.hpp
+++ b/dispatch/d3dimports.hpp
@@ -27,8 +27,7 @@
  * Central place for all DDraw/D3D includes, and respective OS dependent headers.
  */
 
-#ifndef _D3DIMPORTS_HPP_
-#define _D3DIMPORTS_HPP_
+#pragma once
 
 
 #include <windows.h>
@@ -56,4 +55,3 @@
 #endif
 
 
-#endif /* _D3DIMPORTS_HPP_ */
diff --git a/dispatch/dlopen.hpp b/dispatch/dlopen.hpp
index c1a71ba8..d6eba006 100644
--- a/dispatch/dlopen.hpp
+++ b/dispatch/dlopen.hpp
@@ -27,8 +27,7 @@
  * Provides access to real dlopen, as tracing libraries interpose it.
  */
 
-#ifndef _DLOPEN_HPP_
-#define _DLOPEN_HPP_
+#pragma once
 
 #include <dlfcn.h>
 
@@ -63,4 +62,3 @@ _dlopen(const char *filename, int flag)
     return dlopen_ptr(filename, flag);
 }
 
-#endif /* _DLOPEN_HPP_ */
diff --git a/dispatch/dxgiint.h b/dispatch/dxgiint.h
index 49384d28..8df47b4c 100644
--- a/dispatch/dxgiint.h
+++ b/dispatch/dxgiint.h
@@ -24,8 +24,7 @@
  **************************************************************************/
 
 
-#ifndef _DXGIINT_H_
-#define _DXGIINT_H_
+#pragma once
 
 #include <windows.h>
 
@@ -54,4 +53,3 @@ struct IDXGIFactoryDWM: public IUnknown
 };
 
 
-#endif /* _DXGIINT_H_ */
diff --git a/dispatch/eglimports.hpp b/dispatch/eglimports.hpp
index 49cf177a..95b52ee8 100644
--- a/dispatch/eglimports.hpp
+++ b/dispatch/eglimports.hpp
@@ -28,8 +28,7 @@
  * directly, or indirectly through glimports.h.
  */
 
-#ifndef _EGLIMPORTS_HPP_
-#define _EGLIMPORTS_HPP_
+#pragma once
 
 
 #include <KHR/khrplatform.h>
@@ -88,4 +87,3 @@ typedef int32_t  GLclampx;
 #include "GLES/glext.h"
 
 
-#endif /* _EGLIMPORTS_HPP_ */
diff --git a/dispatch/glimports.hpp b/dispatch/glimports.hpp
index 21b57b9b..d535c793 100644
--- a/dispatch/glimports.hpp
+++ b/dispatch/glimports.hpp
@@ -27,8 +27,7 @@
  * Central place for all GL includes, and respective OS dependent headers.
  */
 
-#ifndef _GLIMPORTS_HPP_
-#define _GLIMPORTS_HPP_
+#pragma once
 
 
 #if defined(_WIN32)
@@ -244,4 +243,3 @@ CGLError CGLUpdateContext(CGLContextObj ctx);
 #include "eglimports.hpp"
 
 
-#endif /* _GLIMPORTS_HPP_ */
diff --git a/dispatch/glproc.py b/dispatch/glproc.py
index a1231f98..8e4dddad 100644
--- a/dispatch/glproc.py
+++ b/dispatch/glproc.py
@@ -570,8 +570,7 @@ if __name__ == '__main__':
 
     sys.stdout = open(decl, 'wt')
     print
-    print '#ifndef _GLPROC_HPP_'
-    print '#define _GLPROC_HPP_'
+    print '#pragma once'
     print
     print '#include "glimports.hpp"'
     print
@@ -604,8 +603,6 @@ if __name__ == '__main__':
     print
     dispatcher.dispatchModuleDecl(glapi)
     print
-    print '#endif /* !_GLPROC_HPP_ */'
-    print
 
     sys.stdout = open(impl, 'wt')
     print