From 8da9e549576d6188faa9e76afdf8e6559bdea3fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Mon, 5 Dec 2016 19:52:01 -0800 Subject: [PATCH] Renamed bgfxdefines.h to defines.h, and bgfxplatform.h to platform.h. --- examples/common/entry/entry_android.cpp | 2 +- examples/common/entry/entry_glfw.cpp | 2 +- examples/common/entry/entry_ios.mm | 2 +- examples/common/entry/entry_nacl.cpp | 3 +-- examples/common/entry/entry_osx.mm | 2 +- examples/common/entry/entry_sdl.cpp | 2 +- examples/common/entry/entry_windows.cpp | 2 +- examples/common/entry/entry_winrt.cx | 2 +- examples/common/entry/entry_x11.cpp | 2 +- include/bgfx/bgfx.h | 2 +- include/bgfx/c99/bgfx.h | 2 +- include/bgfx/c99/{bgfxplatform.h => platform.h} | 0 include/bgfx/{bgfxdefines.h => defines.h} | 0 include/bgfx/{bgfxplatform.h => platform.h} | 0 src/bgfx.cpp | 2 +- src/bgfx_p.h | 2 +- src/glcontext_ppapi.cpp | 2 +- 17 files changed, 14 insertions(+), 15 deletions(-) rename include/bgfx/c99/{bgfxplatform.h => platform.h} (100%) rename include/bgfx/{bgfxdefines.h => defines.h} (100%) rename include/bgfx/{bgfxplatform.h => platform.h} (100%) diff --git a/examples/common/entry/entry_android.cpp b/examples/common/entry/entry_android.cpp index 155fb894b..8d00951e0 100644 --- a/examples/common/entry/entry_android.cpp +++ b/examples/common/entry/entry_android.cpp @@ -7,7 +7,7 @@ #if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_ANDROID -#include +#include #include #include diff --git a/examples/common/entry/entry_glfw.cpp b/examples/common/entry/entry_glfw.cpp index cba7fbbfe..40c400a78 100644 --- a/examples/common/entry/entry_glfw.cpp +++ b/examples/common/entry/entry_glfw.cpp @@ -26,7 +26,7 @@ #endif // #include -#include +#include #include #include diff --git a/examples/common/entry/entry_ios.mm b/examples/common/entry/entry_ios.mm index a5348212e..cea2e1393 100644 --- a/examples/common/entry/entry_ios.mm +++ b/examples/common/entry/entry_ios.mm @@ -17,7 +17,7 @@ //# define HAS_METAL_SDK #endif -#include +#include #include #include diff --git a/examples/common/entry/entry_nacl.cpp b/examples/common/entry/entry_nacl.cpp index 7ce93756e..0512c8075 100644 --- a/examples/common/entry/entry_nacl.cpp +++ b/examples/common/entry/entry_nacl.cpp @@ -7,7 +7,7 @@ #if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_NACL -#include +#include #include #include @@ -29,7 +29,6 @@ #include #include -#include #include #include "entry.h" diff --git a/examples/common/entry/entry_osx.mm b/examples/common/entry/entry_osx.mm index 5e651e264..fbe3b14db 100644 --- a/examples/common/entry/entry_osx.mm +++ b/examples/common/entry/entry_osx.mm @@ -9,7 +9,7 @@ #import -#include +#include #include #include diff --git a/examples/common/entry/entry_sdl.cpp b/examples/common/entry/entry_sdl.cpp index 63159c6ac..900ebc054 100644 --- a/examples/common/entry/entry_sdl.cpp +++ b/examples/common/entry/entry_sdl.cpp @@ -20,7 +20,7 @@ BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG("-Wextern-c-compat") #include BX_PRAGMA_DIAGNOSTIC_POP() -#include +#include #if defined(None) // X11 defines this... # undef None #endif // defined(None) diff --git a/examples/common/entry/entry_windows.cpp b/examples/common/entry/entry_windows.cpp index 28e6f28fe..66a6a8058 100644 --- a/examples/common/entry/entry_windows.cpp +++ b/examples/common/entry/entry_windows.cpp @@ -7,7 +7,7 @@ #if ENTRY_CONFIG_USE_NATIVE && BX_PLATFORM_WINDOWS -#include +#include #include #include diff --git a/examples/common/entry/entry_winrt.cx b/examples/common/entry/entry_winrt.cx index f2b3cefe4..39e3d1d24 100644 --- a/examples/common/entry/entry_winrt.cx +++ b/examples/common/entry/entry_winrt.cx @@ -7,7 +7,7 @@ #if BX_PLATFORM_WINRT || BX_PLATFORM_XBOXONE -#include +#include #include #include #include diff --git a/examples/common/entry/entry_x11.cpp b/examples/common/entry/entry_x11.cpp index 16f955dc8..db5d3eac3 100644 --- a/examples/common/entry/entry_x11.cpp +++ b/examples/common/entry/entry_x11.cpp @@ -11,7 +11,7 @@ #define XK_LATIN1 #include #include // will include X11 which #defines None... Don't mess with order of includes. -#include +#include #undef None #include diff --git a/include/bgfx/bgfx.h b/include/bgfx/bgfx.h index 1caa1b6be..d44a6ffea 100644 --- a/include/bgfx/bgfx.h +++ b/include/bgfx/bgfx.h @@ -10,7 +10,7 @@ #include // uint32_t #include // NULL -#include +#include /// #define BGFX_HANDLE(_name) \ diff --git a/include/bgfx/c99/bgfx.h b/include/bgfx/c99/bgfx.h index 203de8734..3e45f598e 100644 --- a/include/bgfx/c99/bgfx.h +++ b/include/bgfx/c99/bgfx.h @@ -39,7 +39,7 @@ # define BGFX_C_API BGFX_SHARED_LIB_API #endif // defined(__cplusplus) -#include +#include typedef enum bgfx_renderer_type { diff --git a/include/bgfx/c99/bgfxplatform.h b/include/bgfx/c99/platform.h similarity index 100% rename from include/bgfx/c99/bgfxplatform.h rename to include/bgfx/c99/platform.h diff --git a/include/bgfx/bgfxdefines.h b/include/bgfx/defines.h similarity index 100% rename from include/bgfx/bgfxdefines.h rename to include/bgfx/defines.h diff --git a/include/bgfx/bgfxplatform.h b/include/bgfx/platform.h similarity index 100% rename from include/bgfx/bgfxplatform.h rename to include/bgfx/platform.h diff --git a/src/bgfx.cpp b/src/bgfx.cpp index ede4d3dbc..cdc964113 100644 --- a/src/bgfx.cpp +++ b/src/bgfx.cpp @@ -3850,7 +3850,7 @@ error: } // namespace bgfx #include -#include +#include #define FLAGS_MASK_TEST(_flags, _mask) ( (_flags) == ( (_flags) & (_mask) ) ) diff --git a/src/bgfx_p.h b/src/bgfx_p.h index 1e83aefeb..8a0529b20 100644 --- a/src/bgfx_p.h +++ b/src/bgfx_p.h @@ -139,7 +139,7 @@ namespace bgfx #include #include -#include +#include #include "image.h" #include "shader.h" diff --git a/src/glcontext_ppapi.cpp b/src/glcontext_ppapi.cpp index c0c2c45ae..c710832b4 100644 --- a/src/glcontext_ppapi.cpp +++ b/src/glcontext_ppapi.cpp @@ -6,7 +6,7 @@ #include "bgfx_p.h" #if BX_PLATFORM_NACL && (BGFX_CONFIG_RENDERER_OPENGLES || BGFX_CONFIG_RENDERER_OPENGL) -# include +# include # include "renderer_gl.h" namespace bgfx { namespace gl