diff options
Diffstat (limited to 'intern/ghost/test')
-rw-r--r-- | intern/ghost/test/gears/GHOST_C-Test.c | 6 | ||||
-rw-r--r-- | intern/ghost/test/gears/GHOST_Test.cpp | 6 | ||||
-rw-r--r-- | intern/ghost/test/multitest/EventToBuf.c | 2 | ||||
-rw-r--r-- | intern/ghost/test/multitest/GL.h | 2 | ||||
-rw-r--r-- | intern/ghost/test/multitest/MultiTest.c | 12 | ||||
-rw-r--r-- | intern/ghost/test/multitest/Util.c | 2 |
6 files changed, 15 insertions, 15 deletions
diff --git a/intern/ghost/test/gears/GHOST_C-Test.c b/intern/ghost/test/gears/GHOST_C-Test.c index 80675ac5e3d..3419f70dfcf 100644 --- a/intern/ghost/test/gears/GHOST_C-Test.c +++ b/intern/ghost/test/gears/GHOST_C-Test.c @@ -25,10 +25,10 @@ * in turn, is probably taken from somewhere as well. */ -#include <stdlib.h> +#include <math.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> -#include <math.h> #define FALSE 0 @@ -36,8 +36,8 @@ #if defined(WIN32) || defined(__APPLE__) # ifdef WIN32 -# include <windows.h> # include <GL/gl.h> +# include <windows.h> # else /* WIN32 */ /* __APPLE__ is defined */ # include <AGL/gl.h> diff --git a/intern/ghost/test/gears/GHOST_Test.cpp b/intern/ghost/test/gears/GHOST_Test.cpp index 47eddbcfb83..a554bfeebef 100644 --- a/intern/ghost/test/gears/GHOST_Test.cpp +++ b/intern/ghost/test/gears/GHOST_Test.cpp @@ -30,8 +30,8 @@ #if defined(WIN32) || defined(__APPLE__) # ifdef WIN32 -# include <windows.h> # include <atlbase.h> +# include <windows.h> # include <GL/gl.h> # else // WIN32 \ @@ -42,12 +42,12 @@ # include <GL/gl.h> #endif // defined(WIN32) || defined(__APPLE__) -#include "STR_String.h" #include "GHOST_Rect.h" +#include "STR_String.h" -#include "GHOST_ISystem.h" #include "GHOST_IEvent.h" #include "GHOST_IEventConsumer.h" +#include "GHOST_ISystem.h" #define LEFT_EYE 0 #define RIGHT_EYE 1 diff --git a/intern/ghost/test/multitest/EventToBuf.c b/intern/ghost/test/multitest/EventToBuf.c index 57fb950fa8b..788c0221753 100644 --- a/intern/ghost/test/multitest/EventToBuf.c +++ b/intern/ghost/test/multitest/EventToBuf.c @@ -23,8 +23,8 @@ #include "MEM_guardedalloc.h" -#include "GHOST_C-api.h" #include "EventToBuf.h" +#include "GHOST_C-api.h" char *eventtype_to_string(GHOST_TEventType type) { diff --git a/intern/ghost/test/multitest/GL.h b/intern/ghost/test/multitest/GL.h index 2a7d95212e1..34ac1a40d9e 100644 --- a/intern/ghost/test/multitest/GL.h +++ b/intern/ghost/test/multitest/GL.h @@ -20,8 +20,8 @@ #if defined(WIN32) || defined(__APPLE__) # ifdef WIN32 -# include <windows.h> # include <GL/gl.h> +# include <windows.h> # else // WIN32 // __APPLE__ is defined # include <AGL/gl.h> diff --git a/intern/ghost/test/multitest/MultiTest.c b/intern/ghost/test/multitest/MultiTest.c index 374c7170dc6..75aa0119a7f 100644 --- a/intern/ghost/test/multitest/MultiTest.c +++ b/intern/ghost/test/multitest/MultiTest.c @@ -33,13 +33,13 @@ # pragma warning(disable : 4244 4305) #endif +#include <math.h> +#include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdio.h> -#include <math.h> -#include <GL/glew.h> #include "GL.h" +#include <GL/glew.h> #include "MEM_guardedalloc.h" @@ -47,16 +47,16 @@ #include "BLF_api.h" -#include "Util.h" #include "Basic.h" -#include "ScrollBar.h" #include "EventToBuf.h" +#include "ScrollBar.h" +#include "Util.h" #include "WindowData.h" /* GPU API. */ -#include "GPU_immediate.h" #include "GPU_context.h" +#include "GPU_immediate.h" #include "GPU_init_exit.h" extern int datatoc_bfont_ttf_size; diff --git a/intern/ghost/test/multitest/Util.c b/intern/ghost/test/multitest/Util.c index c6cdebd39ce..962dd88c47b 100644 --- a/intern/ghost/test/multitest/Util.c +++ b/intern/ghost/test/multitest/Util.c @@ -19,9 +19,9 @@ #include <stdlib.h> -#include <string.h> #include <stdarg.h> #include <stdio.h> +#include <string.h> #include "MEM_guardedalloc.h" |