diff --git a/VisualC/SDL/SDL_VS2005.vcproj b/VisualC/SDL/SDL_VS2005.vcproj index 7d769b268..bce129fd3 100644 --- a/VisualC/SDL/SDL_VS2005.vcproj +++ b/VisualC/SDL/SDL_VS2005.vcproj @@ -29,7 +29,7 @@ diff --git a/VisualC/SDL/SDL_VS2008.vcproj b/VisualC/SDL/SDL_VS2008.vcproj index 8ded09df1..35fdbc306 100644 --- a/VisualC/SDL/SDL_VS2008.vcproj +++ b/VisualC/SDL/SDL_VS2008.vcproj @@ -30,7 +30,7 @@ diff --git a/VisualC/SDL/SDL_VS2010.vcxproj b/VisualC/SDL/SDL_VS2010.vcxproj index 56e2e8d16..cf3a604cc 100644 --- a/VisualC/SDL/SDL_VS2010.vcxproj +++ b/VisualC/SDL/SDL_VS2010.vcxproj @@ -75,8 +75,8 @@ Making sure basic SDL headers are in place... if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY -echo Copying SDL_config_win32.h to SDL_config.h... -copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h" +echo Copying SDL_config_windows.h to SDL_config.h... +copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h" :SDLCONFIGOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY @@ -155,8 +155,8 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" Making sure basic SDL headers are in place... if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY -echo Copying SDL_config_win32.h to SDL_config.h... -copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h" +echo Copying SDL_config_windows.h to SDL_config.h... +copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h" :SDLCONFIGOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY @@ -238,7 +238,7 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" - + @@ -290,7 +290,7 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" - + @@ -299,7 +299,7 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" - + @@ -323,26 +323,26 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" - + - + - - - - - - - - - - + + + + + + + + + + - + @@ -389,7 +389,7 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" - + @@ -397,13 +397,13 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" - + - + @@ -414,7 +414,7 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" - + @@ -432,27 +432,27 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" - - - + + + - - - + + + - - - - - - - - - - + + + + + + + + + + @@ -460,4 +460,4 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" - \ No newline at end of file + diff --git a/VisualC/SDLmain/SDLmain_VS2005.vcproj b/VisualC/SDLmain/SDLmain_VS2005.vcproj index e6fde89bf..276747f29 100644 --- a/VisualC/SDLmain/SDLmain_VS2005.vcproj +++ b/VisualC/SDLmain/SDLmain_VS2005.vcproj @@ -29,7 +29,7 @@ diff --git a/VisualC/SDLmain/SDLmain_VS2008.vcproj b/VisualC/SDLmain/SDLmain_VS2008.vcproj index 3b10b7225..1bbe93e77 100644 --- a/VisualC/SDLmain/SDLmain_VS2008.vcproj +++ b/VisualC/SDLmain/SDLmain_VS2008.vcproj @@ -30,7 +30,7 @@ diff --git a/VisualC/SDLmain/SDLmain_VS2010.vcxproj b/VisualC/SDLmain/SDLmain_VS2010.vcxproj index 9e3c51f76..a9dda6083 100644 --- a/VisualC/SDLmain/SDLmain_VS2010.vcxproj +++ b/VisualC/SDLmain/SDLmain_VS2010.vcxproj @@ -102,8 +102,8 @@ Making sure basic SDL headers are in place... if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY -echo Copying SDL_config_win32.h to SDL_config.h... -copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h" +echo Copying SDL_config_windows.h to SDL_config.h... +copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h" :SDLCONFIGOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY @@ -155,8 +155,8 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" Making sure basic SDL headers are in place... if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY -echo Copying SDL_config_win32.h to SDL_config.h... -copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h" +echo Copying SDL_config_windows.h to SDL_config.h... +copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h" :SDLCONFIGOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY @@ -208,8 +208,8 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" Making sure basic SDL headers are in place... if exist "$(ProjectDir)\..\..\include\SDL_config.h" goto SDLCONFIGOKAY -echo Copying SDL_config_win32.h to SDL_config.h... -copy "$(ProjectDir)\..\..\include\SDL_config_win32.h" "$(ProjectDir)\..\..\include\SDL_config.h" +echo Copying SDL_config_windows.h to SDL_config.h... +copy "$(ProjectDir)\..\..\include\SDL_config_windows.h" "$(ProjectDir)\..\..\include\SDL_config.h" :SDLCONFIGOKAY if exist "$(ProjectDir)\..\..\include\SDL_revision.h" goto SDLREVISIONOKAY @@ -256,9 +256,9 @@ echo #define SDL_REVISION 0 >"$(ProjectDir)\..\..\include\SDL_revision.h" - + - \ No newline at end of file + diff --git a/configure.in b/configure.in index 995c5f057..239a05b46 100644 --- a/configure.in +++ b/configure.in @@ -1645,8 +1645,8 @@ CheckOpenGLESQNX() } -dnl Check for Win32 OpenGL -CheckWIN32GL() +dnl Check for Windows OpenGL +CheckWINDOWSGL() { if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then AC_DEFINE(SDL_VIDEO_OPENGL) @@ -1906,10 +1906,10 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [[default=yes]]]) fi } -dnl Determine whether the compiler can produce Win32 executables -CheckWIN32() +dnl Determine whether the compiler can produce Windows executables +CheckWINDOWS() { - AC_MSG_CHECKING(Win32 compiler) + AC_MSG_CHECKING(Windows compiler) have_win32_gcc=no AC_TRY_COMPILE([ #include @@ -1920,7 +1920,7 @@ CheckWIN32() AC_MSG_RESULT($have_win32_gcc) if test x$have_win32_gcc != xyes; then AC_MSG_ERROR([ -*** Your compiler ($CC) does not produce Win32 executables! +*** Your compiler ($CC) does not produce Windows executables! ]) fi @@ -1938,7 +1938,7 @@ CheckWIN32() dnl See if the user wants to redirect standard output to files AC_ARG_ENABLE(stdio-redirect, -AC_HELP_STRING([--enable-stdio-redirect], [Redirect STDIO to files on Win32 [[default=yes]]]), +AC_HELP_STRING([--enable-stdio-redirect], [Redirect STDIO to files on Windows [[default=yes]]]), , enable_stdio_redirect=yes) if test x$enable_stdio_redirect != xyes; then EXTRA_CFLAGS="$EXTRA_CFLAGS -DNO_STDIO_REDIRECT" @@ -1949,7 +1949,7 @@ dnl Find the DirectX includes and libraries CheckDIRECTX() { AC_ARG_ENABLE(directx, -AC_HELP_STRING([--enable-directx], [use DirectX for Win32 audio/video [[default=yes]]]), +AC_HELP_STRING([--enable-directx], [use DirectX for Windows audio/video [[default=yes]]]), , enable_directx=yes) if test x$enable_directx = xyes; then AC_CHECK_HEADER(d3d9.h, have_d3d=yes) @@ -2332,10 +2332,10 @@ case "$host" in CheckDummyVideo CheckDiskAudio CheckDummyAudio - CheckWIN32 + CheckWINDOWS if test x$enable_video = xyes; then - AC_DEFINE(SDL_VIDEO_DRIVER_WIN32) - SOURCES="$SOURCES $srcdir/src/video/win32/*.c" + AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS) + SOURCES="$SOURCES $srcdir/src/video/windows/*.c" have_video=yes AC_ARG_ENABLE(render-gdi, AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]), @@ -2381,10 +2381,10 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau fi # Set up files for the thread library if test x$enable_threads = xyes; then - AC_DEFINE(SDL_THREAD_WIN32) - SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" - SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" - SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" + AC_DEFINE(SDL_THREAD_WINDOWS) + SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_sysmutex.c" + SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_syssem.c" + SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_systhread.c" SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" have_threads=yes fi @@ -2396,8 +2396,8 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau fi # Set up files for the shared object loading library if test x$enable_loadso = xyes; then - AC_DEFINE(SDL_LOADSO_WIN32) - SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" + AC_DEFINE(SDL_LOADSO_WINDOWS) + SOURCES="$SOURCES $srcdir/src/loadso/windows/*.c" have_loadso=yes fi # Set up the system libraries we need @@ -2412,8 +2412,8 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau ;; esac - # The Win32 platform requires special setup - SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c" + # The Windows platform requires special setup + SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c" EXTRA_CFLAGS="$EXTRA_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420" EXTRA_LDFLAGS="-lSDLmain $EXTRA_LDFLAGS" ;; @@ -2431,13 +2431,13 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau CheckDummyVideo CheckDiskAudio CheckDummyAudio - CheckWIN32 - CheckWIN32GL + CheckWINDOWS + CheckWINDOWSGL CheckDIRECTX # Set up files for the video library if test x$enable_video = xyes; then - AC_DEFINE(SDL_VIDEO_DRIVER_WIN32) - SOURCES="$SOURCES $srcdir/src/video/win32/*.c" + AC_DEFINE(SDL_VIDEO_DRIVER_WINDOWS) + SOURCES="$SOURCES $srcdir/src/video/windows/*.c" have_video=yes AC_ARG_ENABLE(render-gdi, AC_HELP_STRING([--enable-render-gdi], [enable the GDI render driver [[default=yes]]]), @@ -2466,18 +2466,18 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau if test x$enable_joystick = xyes; then if test x$have_dinput = xyes; then AC_DEFINE(SDL_JOYSTICK_DINPUT) - SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_dxjoystick.c" + SOURCES="$SOURCES $srcdir/src/joystick/windows/SDL_dxjoystick.c" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldinput8 -ldxguid -ldxerr8" else AC_DEFINE(SDL_JOYSTICK_WINMM) - SOURCES="$SOURCES $srcdir/src/joystick/win32/SDL_mmjoystick.c" + SOURCES="$SOURCES $srcdir/src/joystick/windows/SDL_mmjoystick.c" fi have_joystick=yes fi if test x$enable_haptic = xyes; then if test x$have_dinput = xyes; then AC_DEFINE(SDL_HAPTIC_DINPUT) - SOURCES="$SOURCES $srcdir/src/haptic/win32/SDL_syshaptic.c" + SOURCES="$SOURCES $srcdir/src/haptic/windows/SDL_syshaptic.c" have_haptic=yes fi fi @@ -2488,23 +2488,23 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau fi # Set up files for the thread library if test x$enable_threads = xyes; then - AC_DEFINE(SDL_THREAD_WIN32) - SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" - SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" - SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" + AC_DEFINE(SDL_THREAD_WINDOWS) + SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_sysmutex.c" + SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_syssem.c" + SOURCES="$SOURCES $srcdir/src/thread/windows/SDL_systhread.c" SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" have_threads=yes fi # Set up files for the timer library if test x$enable_timers = xyes; then - AC_DEFINE(SDL_TIMER_WIN32) - SOURCES="$SOURCES $srcdir/src/timer/win32/*.c" + AC_DEFINE(SDL_TIMER_WINDOWS) + SOURCES="$SOURCES $srcdir/src/timer/windows/*.c" have_timers=yes fi # Set up files for the shared object loading library if test x$enable_loadso = xyes; then - AC_DEFINE(SDL_LOADSO_WIN32) - SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" + AC_DEFINE(SDL_LOADSO_WINDOWS) + SOURCES="$SOURCES $srcdir/src/loadso/windows/*.c" have_loadso=yes fi # Set up the system libraries we need @@ -2512,9 +2512,9 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau # You can get this here: http://libunicows.sourceforge.net/ #EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lunicows" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lmsimg32 -lwinmm -limm32 -lole32 -loleaut32 -lversion -luuid" - # The Win32 platform requires special setup - VERSION_SOURCES="$srcdir/src/main/win32/*.rc" - SDLMAIN_SOURCES="$srcdir/src/main/win32/*.c" + # The Windows platform requires special setup + VERSION_SOURCES="$srcdir/src/main/windows/*.rc" + SDLMAIN_SOURCES="$srcdir/src/main/windows/*.c" SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" SDL_LIBS="-lmingw32 -lSDLmain $SDL_LIBS -mwindows" ;; diff --git a/include/SDL_compat.h b/include/SDL_compat.h index 5613e9eea..96a5f4220 100644 --- a/include/SDL_compat.h +++ b/include/SDL_compat.h @@ -64,6 +64,12 @@ extern "C" { */ /*@{*/ +/* Platform */ +#ifdef __WINDOWS__ +#undef __WIN32__ +#define __WIN32__ 1 +#endif + /** * \name Surface flags */ diff --git a/include/SDL_config.h.default b/include/SDL_config.h.default index c6b17de41..bc1647d75 100644 --- a/include/SDL_config.h.default +++ b/include/SDL_config.h.default @@ -40,8 +40,8 @@ #include "SDL_config_iphoneos.h" #elif defined(__MACOSX__) #include "SDL_config_macosx.h" -#elif defined(__WIN32__) -#include "SDL_config_win32.h" +#elif defined(__WINDOWS__) +#include "SDL_config_windows.h" #else #include "SDL_config_minimal.h" #endif /* platform config */ diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in index 404152c6f..491fa1a4b 100644 --- a/include/SDL_config.h.in +++ b/include/SDL_config.h.in @@ -89,7 +89,7 @@ #undef HAVE_REALLOC #undef HAVE_FREE #undef HAVE_ALLOCA -#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */ +#ifndef __WINDOWS__ /* Don't use C runtime versions of these on Windows */ #undef HAVE_GETENV #undef HAVE_SETENV #undef HAVE_PUTENV @@ -235,7 +235,7 @@ #undef SDL_LOADSO_DLOPEN #undef SDL_LOADSO_DUMMY #undef SDL_LOADSO_LDG -#undef SDL_LOADSO_WIN32 +#undef SDL_LOADSO_WINDOWS /* Enable various threading systems */ #undef SDL_THREAD_BEOS @@ -244,7 +244,7 @@ #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP #undef SDL_THREAD_SPROC -#undef SDL_THREAD_WIN32 +#undef SDL_THREAD_WINDOWS /* Enable various timer systems */ #undef SDL_TIMER_BEOS @@ -252,7 +252,7 @@ #undef SDL_TIMER_NDS #undef SDL_TIMER_RISCOS #undef SDL_TIMER_UNIX -#undef SDL_TIMER_WIN32 +#undef SDL_TIMER_WINDOWS #undef SDL_TIMER_WINCE /* Enable various video drivers */ @@ -265,7 +265,7 @@ #undef SDL_VIDEO_DRIVER_PHOTON #undef SDL_VIDEO_DRIVER_QNXGF #undef SDL_VIDEO_DRIVER_RISCOS -#undef SDL_VIDEO_DRIVER_WIN32 +#undef SDL_VIDEO_DRIVER_WINDOWS #undef SDL_VIDEO_DRIVER_X11 #undef SDL_VIDEO_DRIVER_X11_DYNAMIC #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT diff --git a/include/SDL_config_win32.h b/include/SDL_config_windows.h similarity index 95% rename from include/SDL_config_win32.h rename to include/SDL_config_windows.h index 2ea0e37da..489d4b9aa 100644 --- a/include/SDL_config_win32.h +++ b/include/SDL_config_windows.h @@ -20,8 +20,8 @@ slouken@libsdl.org */ -#ifndef _SDL_config_win32_h -#define _SDL_config_win32_h +#ifndef _SDL_config_windows2_h +#define _SDL_config_windows2_h #include "SDL_platform.h" @@ -162,21 +162,21 @@ typedef unsigned int uintptr_t; #endif /* Enable various shared object loading systems */ -#define SDL_LOADSO_WIN32 1 +#define SDL_LOADSO_WINDOWS 1 /* Enable various threading systems */ -#define SDL_THREAD_WIN32 1 +#define SDL_THREAD_WINDOWS 1 /* Enable various timer systems */ #ifdef _WIN32_WCE #define SDL_TIMER_WINCE 1 #else -#define SDL_TIMER_WIN32 1 +#define SDL_TIMER_WINDOWS 1 #endif /* Enable various video drivers */ #define SDL_VIDEO_DRIVER_DUMMY 1 -#define SDL_VIDEO_DRIVER_WIN32 1 +#define SDL_VIDEO_DRIVER_WINDOWS 1 #define SDL_VIDEO_RENDER_D3D 1 #define SDL_VIDEO_RENDER_GDI 1 @@ -196,4 +196,4 @@ typedef unsigned int uintptr_t; #define SDL_ASSEMBLY_ROUTINES 1 #endif -#endif /* _SDL_config_win32_h */ +#endif /* _SDL_config_windows2_h */ diff --git a/include/SDL_main.h b/include/SDL_main.h index df75a2f63..fe9f45986 100644 --- a/include/SDL_main.h +++ b/include/SDL_main.h @@ -31,7 +31,7 @@ * Redefine main() on some platforms so that it is called by SDL. */ -#if defined(__WIN32__) || \ +#if defined(__WINDOWS__) || \ (defined(__MWERKS__) && !defined(__BEOS__)) || \ defined(__SYMBIAN32__) || defined(__IPHONEOS__) || \ defined(__ANDROID__) @@ -66,7 +66,7 @@ extern C_LINKAGE int SDL_main(int argc, char *argv[]); /* From the SDL library code -- needed for registering the app on Win32 */ -#ifdef __WIN32__ +#ifdef __WINDOWS__ #include "begin_code.h" #ifdef __cplusplus diff --git a/include/SDL_opengl.h b/include/SDL_opengl.h index 8402e72c9..5a391c034 100644 --- a/include/SDL_opengl.h +++ b/include/SDL_opengl.h @@ -31,7 +31,7 @@ #include "SDL_config.h" -#ifdef __WIN32__ +#ifdef __WINDOWS__ #define WIN32_LEAN_AND_MEAN #ifndef NOMINMAX #define NOMINMAX /* Don't defined min() and max() */ diff --git a/include/SDL_platform.h b/include/SDL_platform.h index 13bdc0d74..583c6a81a 100644 --- a/include/SDL_platform.h +++ b/include/SDL_platform.h @@ -125,8 +125,8 @@ #define __SOLARIS__ 1 #endif #if defined(WIN32) || defined(_WIN32) -#undef __WIN32__ -#define __WIN32__ 1 +#undef __WINDOWS__ +#define __WINDOWS__ 1 #endif #if defined(__NDS__) diff --git a/include/SDL_rwops.h b/include/SDL_rwops.h index 5d32b3cf2..1bbac964e 100644 --- a/include/SDL_rwops.h +++ b/include/SDL_rwops.h @@ -83,7 +83,7 @@ typedef struct SDL_RWops Uint32 type; union { -#ifdef __WIN32__ +#ifdef __WINDOWS__ struct { SDL_bool append; @@ -94,7 +94,7 @@ typedef struct SDL_RWops size_t size; size_t left; } buffer; - } win32io; + } windowsio; #endif #ifdef HAVE_STDIO_H struct diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h index aaf0d2092..eac8045a6 100644 --- a/include/SDL_syswm.h +++ b/include/SDL_syswm.h @@ -54,7 +54,7 @@ extern "C" { struct SDL_SysWMinfo; #else -#if defined(SDL_VIDEO_DRIVER_WIN32) +#if defined(SDL_VIDEO_DRIVER_WINDOWS) #define WIN32_LEAN_AND_MEAN #include #endif @@ -118,7 +118,7 @@ struct SDL_SysWMmsg SDL_SYSWM_TYPE subsystem; union { -#if defined(SDL_VIDEO_DRIVER_WIN32) +#if defined(SDL_VIDEO_DRIVER_WINDOWS) struct { HWND hwnd; /**< The window for the message */ UINT msg; /**< The type of message */ @@ -163,7 +163,7 @@ struct SDL_SysWMinfo SDL_SYSWM_TYPE subsystem; union { -#if defined(SDL_VIDEO_DRIVER_WIN32) +#if defined(SDL_VIDEO_DRIVER_WINDOWS) struct { HWND window; /**< The window handle */ diff --git a/include/SDL_thread.h b/include/SDL_thread.h index 1c8a76a25..dd94bd714 100644 --- a/include/SDL_thread.h +++ b/include/SDL_thread.h @@ -55,7 +55,7 @@ typedef unsigned long SDL_threadID; */ typedef int (SDLCALL * SDL_ThreadFunction) (void *data); -#if defined(__WIN32__) && !defined(HAVE_LIBC) +#if defined(__WINDOWS__) && !defined(HAVE_LIBC) /** * \file SDL_thread.h * diff --git a/include/begin_code.h b/include/begin_code.h index 395dc7c6a..ccdcea612 100644 --- a/include/begin_code.h +++ b/include/begin_code.h @@ -42,7 +42,7 @@ # else # define DECLSPEC __declspec(export) # endif -# elif defined(__WIN32__) +# elif defined(__WINDOWS__) # ifdef __BORLANDC__ # ifdef BUILD_SDL # define DECLSPEC @@ -63,7 +63,7 @@ /* By default SDL uses the C calling convention */ #ifndef SDLCALL -#if defined(__WIN32__) && !defined(__GNUC__) +#if defined(__WINDOWS__) && !defined(__GNUC__) #define SDLCALL __cdecl #else #define SDLCALL diff --git a/src/SDL.c b/src/SDL.c index 49620a8e1..9913dbdad 100644 --- a/src/SDL.c +++ b/src/SDL.c @@ -39,7 +39,7 @@ extern void SDL_StartTicks(void); extern int SDL_TimerInit(void); extern void SDL_TimerQuit(void); #endif -#if defined(__WIN32__) +#if defined(__WINDOWS__) extern int SDL_HelperWindowCreate(void); extern int SDL_HelperWindowDestroy(void); #endif @@ -147,7 +147,7 @@ SDL_Init(Uint32 flags) /* Clear the error message */ SDL_ClearError(); -#if defined(__WIN32__) +#if defined(__WINDOWS__) if (SDL_HelperWindowCreate() < 0) { return -1; } @@ -220,7 +220,7 @@ SDL_Quit(void) fflush(stdout); #endif -#if defined(__WIN32__) +#if defined(__WINDOWS__) SDL_HelperWindowDestroy(); #endif SDL_QuitSubSystem(SDL_INIT_EVERYTHING); @@ -312,7 +312,7 @@ SDL_GetPlatform() return "RISC OS"; #elif __SOLARIS__ return "Solaris"; -#elif __WIN32__ +#elif __WINDOWS__ #ifdef _WIN32_WCE return "Windows CE"; #else @@ -325,7 +325,7 @@ SDL_GetPlatform() #endif } -#if defined(__WIN32__) +#if defined(__WINDOWS__) #if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL)) /* Need to include DllMain() on Watcom C for some reason.. */ @@ -347,6 +347,6 @@ _DllMainCRTStartup(HANDLE hModule, } #endif /* building DLL with Watcom C */ -#endif /* __WIN32__ */ +#endif /* __WINDOWS__ */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c index b55fee325..d4b72a7d3 100644 --- a/src/audio/SDL_audio.c +++ b/src/audio/SDL_audio.c @@ -971,7 +971,7 @@ open_audio_device(const char *devname, int iscapture, if (!current_audio.impl.ProvidesOwnCallbackThread) { /* Start the audio thread */ /* !!! FIXME: this is nasty. */ -#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) +#if (defined(__WINDOWS__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) #undef SDL_CreateThread device->thread = SDL_CreateThread(SDL_RunAudio, device, NULL, NULL); #else diff --git a/src/cpuinfo/SDL_cpuinfo.c b/src/cpuinfo/SDL_cpuinfo.c index 7fa382818..b79f02bb0 100644 --- a/src/cpuinfo/SDL_cpuinfo.c +++ b/src/cpuinfo/SDL_cpuinfo.c @@ -38,7 +38,7 @@ #include #include #endif -#ifdef __WIN32__ +#ifdef __WINDOWS__ #define WIN32_LEAN_AND_MEAN #include #endif @@ -319,7 +319,7 @@ SDL_GetCPUCount() sysctlbyname("hw.ncpu", &SDL_CPUCount, &size, NULL, 0); } #endif -#ifdef __WIN32__ +#ifdef __WINDOWS__ if (SDL_CPUCount <= 0) { SYSTEM_INFO info; GetSystemInfo(&info); diff --git a/src/events/SDL_events.c b/src/events/SDL_events.c index 06f533cd2..ad19c09e4 100644 --- a/src/events/SDL_events.c +++ b/src/events/SDL_events.c @@ -170,7 +170,7 @@ SDL_StartEventThread(Uint32 flags) /* The event thread will handle timers too */ SDL_SetTimerThreaded(2); -#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) +#if (defined(__WINDOWS__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC) #undef SDL_CreateThread SDL_EventThread = SDL_CreateThread(SDL_GobbleEvents, NULL, NULL, NULL); diff --git a/src/events/SDL_sysevents.h b/src/events/SDL_sysevents.h index b3029efeb..98440eaaf 100644 --- a/src/events/SDL_sysevents.h +++ b/src/events/SDL_sysevents.h @@ -29,7 +29,7 @@ #define MUST_THREAD_EVENTS #endif -#ifdef __WIN32__ /* Win32 doesn't allow a separate event thread */ +#ifdef __WINDOWS__ /* Windows doesn't allow a separate event thread */ #define CANT_THREAD_EVENTS #endif diff --git a/src/events/scancodes_win32.h b/src/events/scancodes_windows.h similarity index 99% rename from src/events/scancodes_win32.h rename to src/events/scancodes_windows.h index 460ff9e76..2718d37c3 100644 --- a/src/events/scancodes_win32.h +++ b/src/events/scancodes_windows.h @@ -26,7 +26,7 @@ - msdn.microsoft.com */ /* *INDENT-OFF* */ -static const SDL_scancode win32_scancode_table[] = { +static const SDL_scancode windows_scancode_table[] = { /* 0, 0x00 */ SDL_SCANCODE_UNKNOWN, /* 1, 0x01 */ SDL_SCANCODE_UNKNOWN, /* 2, 0x02 */ SDL_SCANCODE_UNKNOWN, diff --git a/src/file/SDL_rwops.c b/src/file/SDL_rwops.c index 99e207b4f..2710872ca 100644 --- a/src/file/SDL_rwops.c +++ b/src/file/SDL_rwops.c @@ -37,7 +37,7 @@ #include #endif /* __NDS__ */ -#ifdef __WIN32__ +#ifdef __WINDOWS__ /* Functions to read/write Win32 API file pointers */ /* Will not use it on WinCE because stdio is buffered, it means @@ -54,7 +54,7 @@ #define READAHEAD_BUFFER_SIZE 1024 static int SDLCALL -win32_file_open(SDL_RWops * context, const char *filename, const char *mode) +windows_file_open(SDL_RWops * context, const char *filename, const char *mode) { #ifndef _WIN32_WCE UINT old_error_mode; @@ -67,10 +67,10 @@ win32_file_open(SDL_RWops * context, const char *filename, const char *mode) if (!context) return -1; /* failed (invalid call) */ - context->hidden.win32io.h = INVALID_HANDLE_VALUE; /* mark this as unusable */ - context->hidden.win32io.buffer.data = NULL; - context->hidden.win32io.buffer.size = 0; - context->hidden.win32io.buffer.left = 0; + context->hidden.windowsio.h = INVALID_HANDLE_VALUE; /* mark this as unusable */ + context->hidden.windowsio.buffer.data = NULL; + context->hidden.windowsio.buffer.size = 0; + context->hidden.windowsio.buffer.left = 0; /* "r" = reading, file must exist */ /* "w" = writing, truncate existing, file may not exist */ @@ -90,9 +90,9 @@ win32_file_open(SDL_RWops * context, const char *filename, const char *mode) if (!r_right && !w_right) /* inconsistent mode */ return -1; /* failed (invalid call) */ - context->hidden.win32io.buffer.data = + context->hidden.windowsio.buffer.data = (char *) SDL_malloc(READAHEAD_BUFFER_SIZE); - if (!context->hidden.win32io.buffer.data) { + if (!context->hidden.windowsio.buffer.data) { SDL_OutOfMemory(); return -1; } @@ -104,8 +104,8 @@ win32_file_open(SDL_RWops * context, const char *filename, const char *mode) if (MultiByteToWideChar(CP_UTF8, 0, filename, -1, filenameW, size) == 0) { SDL_stack_free(filenameW); - SDL_free(context->hidden.win32io.buffer.data); - context->hidden.win32io.buffer.data = NULL; + SDL_free(context->hidden.windowsio.buffer.data); + context->hidden.windowsio.buffer.data = NULL; SDL_SetError("Unable to convert filename to Unicode"); return -1; } @@ -130,51 +130,51 @@ win32_file_open(SDL_RWops * context, const char *filename, const char *mode) #endif /* _WIN32_WCE */ if (h == INVALID_HANDLE_VALUE) { - SDL_free(context->hidden.win32io.buffer.data); - context->hidden.win32io.buffer.data = NULL; + SDL_free(context->hidden.windowsio.buffer.data); + context->hidden.windowsio.buffer.data = NULL; SDL_SetError("Couldn't open %s", filename); return -2; /* failed (CreateFile) */ } - context->hidden.win32io.h = h; - context->hidden.win32io.append = a_mode ? SDL_TRUE : SDL_FALSE; + context->hidden.windowsio.h = h; + context->hidden.windowsio.append = a_mode ? SDL_TRUE : SDL_FALSE; return 0; /* ok */ } static long SDLCALL -win32_file_seek(SDL_RWops * context, long offset, int whence) +windows_file_seek(SDL_RWops * context, long offset, int whence) { - DWORD win32whence; + DWORD windowswhence; long file_pos; - if (!context || context->hidden.win32io.h == INVALID_HANDLE_VALUE) { - SDL_SetError("win32_file_seek: invalid context/file not opened"); + if (!context || context->hidden.windowsio.h == INVALID_HANDLE_VALUE) { + SDL_SetError("windows_file_seek: invalid context/file not opened"); return -1; } /* FIXME: We may be able to satisfy the seek within buffered data */ - if (whence == RW_SEEK_CUR && context->hidden.win32io.buffer.left) { - offset -= (long)context->hidden.win32io.buffer.left; + if (whence == RW_SEEK_CUR && context->hidden.windowsio.buffer.left) { + offset -= (long)context->hidden.windowsio.buffer.left; } - context->hidden.win32io.buffer.left = 0; + context->hidden.windowsio.buffer.left = 0; switch (whence) { case RW_SEEK_SET: - win32whence = FILE_BEGIN; + windowswhence = FILE_BEGIN; break; case RW_SEEK_CUR: - win32whence = FILE_CURRENT; + windowswhence = FILE_CURRENT; break; case RW_SEEK_END: - win32whence = FILE_END; + windowswhence = FILE_END; break; default: - SDL_SetError("win32_file_seek: Unknown value for 'whence'"); + SDL_SetError("windows_file_seek: Unknown value for 'whence'"); return -1; } file_pos = - SetFilePointer(context->hidden.win32io.h, offset, NULL, win32whence); + SetFilePointer(context->hidden.windowsio.h, offset, NULL, windowswhence); if (file_pos != INVALID_SET_FILE_POINTER) return file_pos; /* success */ @@ -184,7 +184,7 @@ win32_file_seek(SDL_RWops * context, long offset, int whence) } static size_t SDLCALL -win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum) +windows_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum) { size_t total_need; size_t total_read = 0; @@ -193,18 +193,18 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum) total_need = size * maxnum; - if (!context || context->hidden.win32io.h == INVALID_HANDLE_VALUE + if (!context || context->hidden.windowsio.h == INVALID_HANDLE_VALUE || !total_need) return 0; - if (context->hidden.win32io.buffer.left > 0) { - void *data = (char *) context->hidden.win32io.buffer.data + - context->hidden.win32io.buffer.size - - context->hidden.win32io.buffer.left; + if (context->hidden.windowsio.buffer.left > 0) { + void *data = (char *) context->hidden.windowsio.buffer.data + + context->hidden.windowsio.buffer.size - + context->hidden.windowsio.buffer.left; read_ahead = - SDL_min(total_need, context->hidden.win32io.buffer.left); + SDL_min(total_need, context->hidden.windowsio.buffer.left); SDL_memcpy(ptr, data, read_ahead); - context->hidden.win32io.buffer.left -= read_ahead; + context->hidden.windowsio.buffer.left -= read_ahead; if (read_ahead == total_need) { return maxnum; @@ -216,19 +216,19 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum) if (total_need < READAHEAD_BUFFER_SIZE) { if (!ReadFile - (context->hidden.win32io.h, context->hidden.win32io.buffer.data, + (context->hidden.windowsio.h, context->hidden.windowsio.buffer.data, READAHEAD_BUFFER_SIZE, &byte_read, NULL)) { SDL_Error(SDL_EFREAD); return 0; } read_ahead = SDL_min(total_need, (int) byte_read); - SDL_memcpy(ptr, context->hidden.win32io.buffer.data, read_ahead); - context->hidden.win32io.buffer.size = byte_read; - context->hidden.win32io.buffer.left = byte_read - read_ahead; + SDL_memcpy(ptr, context->hidden.windowsio.buffer.data, read_ahead); + context->hidden.windowsio.buffer.size = byte_read; + context->hidden.windowsio.buffer.left = byte_read - read_ahead; total_read += read_ahead; } else { if (!ReadFile - (context->hidden.win32io.h, ptr, (DWORD)total_need, &byte_read, NULL)) { + (context->hidden.windowsio.h, ptr, (DWORD)total_need, &byte_read, NULL)) { SDL_Error(SDL_EFREAD); return 0; } @@ -238,7 +238,7 @@ win32_file_read(SDL_RWops * context, void *ptr, size_t size, size_t maxnum) } static size_t SDLCALL -win32_file_write(SDL_RWops * context, const void *ptr, size_t size, +windows_file_write(SDL_RWops * context, const void *ptr, size_t size, size_t num) { @@ -248,20 +248,20 @@ win32_file_write(SDL_RWops * context, const void *ptr, size_t size, total_bytes = size * num; - if (!context || context->hidden.win32io.h == INVALID_HANDLE_VALUE + if (!context || context->hidden.windowsio.h == INVALID_HANDLE_VALUE || total_bytes <= 0 || !size) return 0; - if (context->hidden.win32io.buffer.left) { - SetFilePointer(context->hidden.win32io.h, - -(LONG)context->hidden.win32io.buffer.left, NULL, + if (context->hidden.windowsio.buffer.left) { + SetFilePointer(context->hidden.windowsio.h, + -(LONG)context->hidden.windowsio.buffer.left, NULL, FILE_CURRENT); - context->hidden.win32io.buffer.left = 0; + context->hidden.windowsio.buffer.left = 0; } /* if in append mode, we must go to the EOF before write */ - if (context->hidden.win32io.append) { - if (SetFilePointer(context->hidden.win32io.h, 0L, NULL, FILE_END) == + if (context->hidden.windowsio.append) { + if (SetFilePointer(context->hidden.windowsio.h, 0L, NULL, FILE_END) == INVALID_SET_FILE_POINTER) { SDL_Error(SDL_EFWRITE); return 0; @@ -269,7 +269,7 @@ win32_file_write(SDL_RWops * context, const void *ptr, size_t size, } if (!WriteFile - (context->hidden.win32io.h, ptr, (DWORD)total_bytes, &byte_written, NULL)) { + (context->hidden.windowsio.h, ptr, (DWORD)total_bytes, &byte_written, NULL)) { SDL_Error(SDL_EFWRITE); return 0; } @@ -279,23 +279,23 @@ win32_file_write(SDL_RWops * context, const void *ptr, size_t size, } static int SDLCALL -win32_file_close(SDL_RWops * context) +windows_file_close(SDL_RWops * context) { if (context) { - if (context->hidden.win32io.h != INVALID_HANDLE_VALUE) { - CloseHandle(context->hidden.win32io.h); - context->hidden.win32io.h = INVALID_HANDLE_VALUE; /* to be sure */ + if (context->hidden.windowsio.h != INVALID_HANDLE_VALUE) { + CloseHandle(context->hidden.windowsio.h); + context->hidden.windowsio.h = INVALID_HANDLE_VALUE; /* to be sure */ } - if (context->hidden.win32io.buffer.data) { - SDL_free(context->hidden.win32io.buffer.data); - context->hidden.win32io.buffer.data = NULL; + if (context->hidden.windowsio.buffer.data) { + SDL_free(context->hidden.windowsio.buffer.data); + context->hidden.windowsio.buffer.data = NULL; } SDL_FreeRW(context); } return (0); } -#endif /* __WIN32__ */ +#endif /* __WINDOWS__ */ #ifdef HAVE_STDIO_H @@ -449,18 +449,18 @@ SDL_RWFromFile(const char *file, const char *mode) SDL_SetError("SDL_RWFromFile(): No file or no mode specified"); return NULL; } -#if defined(__WIN32__) +#if defined(__WINDOWS__) rwops = SDL_AllocRW(); if (!rwops) return NULL; /* SDL_SetError already setup by SDL_AllocRW() */ - if (win32_file_open(rwops, file, mode) < 0) { + if (windows_file_open(rwops, file, mode) < 0) { SDL_FreeRW(rwops); return NULL; } - rwops->seek = win32_file_seek; - rwops->read = win32_file_read; - rwops->write = win32_file_write; - rwops->close = win32_file_close; + rwops->seek = windows_file_seek; + rwops->read = windows_file_read; + rwops->write = windows_file_write; + rwops->close = windows_file_close; #elif HAVE_STDIO_H #ifdef __APPLE__ diff --git a/src/haptic/win32/SDL_syshaptic.c b/src/haptic/windows/SDL_syshaptic.c similarity index 99% rename from src/haptic/win32/SDL_syshaptic.c rename to src/haptic/windows/SDL_syshaptic.c index e8b1a95f1..504479acf 100644 --- a/src/haptic/win32/SDL_syshaptic.c +++ b/src/haptic/windows/SDL_syshaptic.c @@ -27,7 +27,7 @@ #include "../SDL_syshaptic.h" #include "SDL_joystick.h" #include "../../joystick/SDL_sysjoystick.h" /* For the real SDL_Joystick */ -#include "../../joystick/win32/SDL_dxjoystick_c.h" /* For joystick hwdata */ +#include "../../joystick/windows/SDL_dxjoystick_c.h" /* For joystick hwdata */ #define MAX_HAPTICS 32 diff --git a/src/joystick/win32/SDL_dxjoystick.c b/src/joystick/windows/SDL_dxjoystick.c similarity index 100% rename from src/joystick/win32/SDL_dxjoystick.c rename to src/joystick/windows/SDL_dxjoystick.c diff --git a/src/joystick/win32/SDL_dxjoystick_c.h b/src/joystick/windows/SDL_dxjoystick_c.h similarity index 100% rename from src/joystick/win32/SDL_dxjoystick_c.h rename to src/joystick/windows/SDL_dxjoystick_c.h diff --git a/src/joystick/win32/SDL_mmjoystick.c b/src/joystick/windows/SDL_mmjoystick.c similarity index 99% rename from src/joystick/win32/SDL_mmjoystick.c rename to src/joystick/windows/SDL_mmjoystick.c index ad0592c22..bcfc83f69 100644 --- a/src/joystick/win32/SDL_mmjoystick.c +++ b/src/joystick/windows/SDL_mmjoystick.c @@ -65,7 +65,7 @@ struct joystick_hwdata } transaxis[6]; }; -/* Convert a win32 Multimedia API return code to a text message */ +/* Convert a Windows Multimedia API return code to a text message */ static void SetMMerror(char *function, int code); diff --git a/src/loadso/win32/SDL_sysloadso.c b/src/loadso/windows/SDL_sysloadso.c similarity index 97% rename from src/loadso/win32/SDL_sysloadso.c rename to src/loadso/windows/SDL_sysloadso.c index ad8179802..c6706be71 100644 --- a/src/loadso/win32/SDL_sysloadso.c +++ b/src/loadso/windows/SDL_sysloadso.c @@ -21,7 +21,7 @@ */ #include "SDL_config.h" -#ifdef SDL_LOADSO_WIN32 +#ifdef SDL_LOADSO_WINDOWS /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ /* System dependent library loading routines */ @@ -61,7 +61,7 @@ SDL_LoadObject(const char *sofile) SDL_free(sofile_t); SDL_free(errbuf_t); -#else /*if defined(__WIN32__) */ +#else /*if defined(__WINDOWS__) */ char errbuf[512]; handle = (void *) LoadLibrary(sofile); @@ -140,6 +140,6 @@ SDL_UnloadObject(void *handle) } } -#endif /* SDL_LOADSO_WIN32 */ +#endif /* SDL_LOADSO_WINDOWS */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/main/win32/SDL_win32_main.c b/src/main/windows/SDL_windows_main.c similarity index 100% rename from src/main/win32/SDL_win32_main.c rename to src/main/windows/SDL_windows_main.c diff --git a/src/main/win32/version.rc b/src/main/windows/version.rc similarity index 100% rename from src/main/win32/version.rc rename to src/main/windows/version.rc diff --git a/src/stdlib/SDL_getenv.c b/src/stdlib/SDL_getenv.c index 387531a88..5d0502f8e 100644 --- a/src/stdlib/SDL_getenv.c +++ b/src/stdlib/SDL_getenv.c @@ -25,7 +25,7 @@ #ifndef HAVE_GETENV -#if defined(__WIN32__) && !defined(_WIN32_WCE) +#if defined(__WINDOWS__) && !defined(_WIN32_WCE) #define WIN32_LEAN_AND_MEAN #include @@ -163,7 +163,7 @@ SDL_getenv(const char *name) return value; } -#endif /* __WIN32__ */ +#endif /* __WINDOWS__ */ #endif /* !HAVE_GETENV */ diff --git a/src/thread/SDL_thread_c.h b/src/thread/SDL_thread_c.h index 7f4b8888e..fd5843c56 100644 --- a/src/thread/SDL_thread_c.h +++ b/src/thread/SDL_thread_c.h @@ -35,8 +35,8 @@ #include "pthread/SDL_systhread_c.h" #elif SDL_THREAD_SPROC #include "irix/SDL_systhread_c.h" -#elif SDL_THREAD_WIN32 -#include "win32/SDL_systhread_c.h" +#elif SDL_THREAD_WINDOWS +#include "windows/SDL_systhread_c.h" #elif SDL_THREAD_NDS #include "nds/SDL_systhread_c.h" #else diff --git a/src/thread/win32/SDL_sysmutex.c b/src/thread/windows/SDL_sysmutex.c similarity index 100% rename from src/thread/win32/SDL_sysmutex.c rename to src/thread/windows/SDL_sysmutex.c diff --git a/src/thread/win32/SDL_syssem.c b/src/thread/windows/SDL_syssem.c similarity index 100% rename from src/thread/win32/SDL_syssem.c rename to src/thread/windows/SDL_syssem.c diff --git a/src/thread/win32/SDL_systhread.c b/src/thread/windows/SDL_systhread.c similarity index 100% rename from src/thread/win32/SDL_systhread.c rename to src/thread/windows/SDL_systhread.c diff --git a/src/thread/win32/SDL_systhread_c.h b/src/thread/windows/SDL_systhread_c.h similarity index 100% rename from src/thread/win32/SDL_systhread_c.h rename to src/thread/windows/SDL_systhread_c.h diff --git a/src/thread/win32/win_ce_semaphore.c b/src/thread/windows/win_ce_semaphore.c similarity index 100% rename from src/thread/win32/win_ce_semaphore.c rename to src/thread/windows/win_ce_semaphore.c diff --git a/src/thread/win32/win_ce_semaphore.h b/src/thread/windows/win_ce_semaphore.h similarity index 100% rename from src/thread/win32/win_ce_semaphore.h rename to src/thread/windows/win_ce_semaphore.h diff --git a/src/timer/win32/SDL_systimer.c b/src/timer/windows/SDL_systimer.c similarity index 98% rename from src/timer/win32/SDL_systimer.c rename to src/timer/windows/SDL_systimer.c index 6372bebd9..083a88040 100644 --- a/src/timer/win32/SDL_systimer.c +++ b/src/timer/windows/SDL_systimer.c @@ -21,7 +21,7 @@ */ #include "SDL_config.h" -#ifdef SDL_TIMER_WIN32 +#ifdef SDL_TIMER_WINDOWS #define WIN32_LEAN_AND_MEAN #include @@ -161,5 +161,6 @@ SDL_SYS_StopTimer(void) return; } -#endif /* SDL_TIMER_WIN32 */ +#endif /* SDL_TIMER_WINDOWS */ + /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/SDL_renderer_gl.c b/src/video/SDL_renderer_gl.c index e3938b1af..b9155fa62 100644 --- a/src/video/SDL_renderer_gl.c +++ b/src/video/SDL_renderer_gl.c @@ -1181,7 +1181,7 @@ GL_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points, } data->glEnd(); } else { -#if defined(__APPLE__) || defined(__WIN32__) +#if defined(__APPLE__) || defined(__WINDOWS__) #else int x1, y1, x2, y2; #endif @@ -1200,7 +1200,7 @@ GL_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points, * least it would be pixel perfect. */ data->glBegin(GL_POINTS); -#if defined(__APPLE__) || defined(__WIN32__) +#if defined(__APPLE__) || defined(__WINDOWS__) /* Mac OS X and Windows seem to always leave the second point open */ data->glVertex2f(0.5f + points[count-1].x, 0.5f + points[count-1].y); #else diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h index fd2fe7edb..55ef1e907 100644 --- a/src/video/SDL_sysvideo.h +++ b/src/video/SDL_sysvideo.h @@ -411,8 +411,8 @@ extern VideoBootStrap X11_bootstrap; #if SDL_VIDEO_DRIVER_DIRECTFB extern VideoBootStrap DirectFB_bootstrap; #endif -#if SDL_VIDEO_DRIVER_WIN32 -extern VideoBootStrap WIN32_bootstrap; +#if SDL_VIDEO_DRIVER_WINDOWS +extern VideoBootStrap WINDOWS_bootstrap; #endif #if SDL_VIDEO_DRIVER_BWINDOW extern VideoBootStrap BWINDOW_bootstrap; diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index 099d280dc..99da176a9 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -34,8 +34,8 @@ #include "../events/SDL_sysevents.h" #include "../events/SDL_events_c.h" -#if SDL_VIDEO_DRIVER_WIN32 -#include "win32/SDL_win32video.h" +#if SDL_VIDEO_DRIVER_WINDOWS +#include "windows/SDL_windowsvideo.h" extern void IME_Present(SDL_VideoData *videodata); #endif @@ -65,8 +65,8 @@ static VideoBootStrap *bootstrap[] = { #if SDL_VIDEO_DRIVER_DIRECTFB &DirectFB_bootstrap, #endif -#if SDL_VIDEO_DRIVER_WIN32 - &WIN32_bootstrap, +#if SDL_VIDEO_DRIVER_WINDOWS + &WINDOWS_bootstrap, #endif #if SDL_VIDEO_DRIVER_BWINDOW &BWINDOW_bootstrap, @@ -2708,7 +2708,7 @@ SDL_RenderPresent(void) if (!renderer || !renderer->RenderPresent) { return; } -#if SDL_VIDEO_DRIVER_WIN32 +#if SDL_VIDEO_DRIVER_WINDOWS IME_Present((SDL_VideoData *)_this->driverdata); #endif renderer->RenderPresent(renderer); diff --git a/src/video/win32/SDL_ceddrawrender.c b/src/video/windows/SDL_ceddrawrender.c similarity index 99% rename from src/video/win32/SDL_ceddrawrender.c rename to src/video/windows/SDL_ceddrawrender.c index 1b2fd1270..7b6d3ff06 100644 --- a/src/video/win32/SDL_ceddrawrender.c +++ b/src/video/windows/SDL_ceddrawrender.c @@ -26,7 +26,7 @@ #if SDL_VIDEO_RENDER_DDRAW -#include "SDL_win32video.h" +#include "SDL_windowsvideo.h" #include "../SDL_yuv_sw_c.h" #if 0 diff --git a/src/video/win32/SDL_ceddrawrender.h b/src/video/windows/SDL_ceddrawrender.h similarity index 100% rename from src/video/win32/SDL_ceddrawrender.h rename to src/video/windows/SDL_ceddrawrender.h diff --git a/src/video/win32/SDL_d3drender.c b/src/video/windows/SDL_d3drender.c similarity index 99% rename from src/video/win32/SDL_d3drender.c rename to src/video/windows/SDL_d3drender.c index 53b5e8a7c..71d9bc82f 100644 --- a/src/video/win32/SDL_d3drender.c +++ b/src/video/windows/SDL_d3drender.c @@ -23,7 +23,7 @@ #if SDL_VIDEO_RENDER_D3D -#include "SDL_win32video.h" +#include "SDL_windowsvideo.h" #include "../SDL_yuv_sw_c.h" #ifdef ASSEMBLE_SHADER diff --git a/src/video/win32/SDL_d3drender.h b/src/video/windows/SDL_d3drender.h similarity index 100% rename from src/video/win32/SDL_d3drender.h rename to src/video/windows/SDL_d3drender.h diff --git a/src/video/win32/SDL_gapirender.c b/src/video/windows/SDL_gapirender.c similarity index 99% rename from src/video/win32/SDL_gapirender.c rename to src/video/windows/SDL_gapirender.c index 8a1f4924d..d8d1dd6f2 100644 --- a/src/video/win32/SDL_gapirender.c +++ b/src/video/windows/SDL_gapirender.c @@ -26,8 +26,8 @@ #if SDL_VIDEO_RENDER_GAPI -#include "SDL_win32video.h" -#include "SDL_win32window.h" +#include "SDL_windowsvideo.h" +#include "SDL_windowswindow.h" #include "../SDL_yuv_sw_c.h" // RawFrameBufferInfo diff --git a/src/video/win32/SDL_gapirender.h b/src/video/windows/SDL_gapirender.h similarity index 100% rename from src/video/win32/SDL_gapirender.h rename to src/video/windows/SDL_gapirender.h diff --git a/src/video/win32/SDL_gapirender_c.h b/src/video/windows/SDL_gapirender_c.h similarity index 100% rename from src/video/win32/SDL_gapirender_c.h rename to src/video/windows/SDL_gapirender_c.h diff --git a/src/video/win32/SDL_gdirender.c b/src/video/windows/SDL_gdirender.c similarity index 99% rename from src/video/win32/SDL_gdirender.c rename to src/video/windows/SDL_gdirender.c index 729069d9f..c52366117 100644 --- a/src/video/win32/SDL_gdirender.c +++ b/src/video/windows/SDL_gdirender.c @@ -23,7 +23,7 @@ #if SDL_VIDEO_RENDER_GDI -#include "SDL_win32video.h" +#include "SDL_windowsvideo.h" #include "../SDL_rect_c.h" #include "../SDL_yuv_sw_c.h" #include "../SDL_alphamult.h" diff --git a/src/video/win32/SDL_gdirender.h b/src/video/windows/SDL_gdirender.h similarity index 100% rename from src/video/win32/SDL_gdirender.h rename to src/video/windows/SDL_gdirender.h diff --git a/src/video/win32/SDL_msctf.h b/src/video/windows/SDL_msctf.h similarity index 100% rename from src/video/win32/SDL_msctf.h rename to src/video/windows/SDL_msctf.h diff --git a/src/video/win32/SDL_vkeys.h b/src/video/windows/SDL_vkeys.h similarity index 100% rename from src/video/win32/SDL_vkeys.h rename to src/video/windows/SDL_vkeys.h diff --git a/src/video/win32/SDL_win32clipboard.c b/src/video/windows/SDL_windowsclipboard.c similarity index 98% rename from src/video/win32/SDL_win32clipboard.c rename to src/video/windows/SDL_windowsclipboard.c index e7e5fd687..17e461b30 100644 --- a/src/video/win32/SDL_win32clipboard.c +++ b/src/video/windows/SDL_windowsclipboard.c @@ -21,8 +21,8 @@ */ #include "SDL_config.h" -#include "SDL_win32video.h" -#include "SDL_win32window.h" +#include "SDL_windowsvideo.h" +#include "SDL_windowswindow.h" #include "../../events/SDL_clipboardevents_c.h" diff --git a/src/video/win32/SDL_win32clipboard.h b/src/video/windows/SDL_windowsclipboard.h similarity index 92% rename from src/video/win32/SDL_win32clipboard.h rename to src/video/windows/SDL_windowsclipboard.h index ab2fb17a7..a11fcdb8f 100644 --- a/src/video/win32/SDL_win32clipboard.h +++ b/src/video/windows/SDL_windowsclipboard.h @@ -21,8 +21,8 @@ */ #include "SDL_config.h" -#ifndef _SDL_win32clipboard_h -#define _SDL_win32clipboard_h +#ifndef _SDL_windowsclipboard_h +#define _SDL_windowsclipboard_h /* Forward declaration */ struct SDL_VideoData; @@ -32,6 +32,6 @@ extern char *WIN_GetClipboardText(_THIS); extern SDL_bool WIN_HasClipboardText(_THIS); extern void WIN_CheckClipboardUpdate(struct SDL_VideoData * data); -#endif /* _SDL_win32clipboard_h */ +#endif /* _SDL_windowsclipboard_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/win32/SDL_win32events.c b/src/video/windows/SDL_windowsevents.c similarity index 99% rename from src/video/win32/SDL_win32events.c rename to src/video/windows/SDL_windowsevents.c index fc0cc1769..563d5d7bd 100644 --- a/src/video/win32/SDL_win32events.c +++ b/src/video/windows/SDL_windowsevents.c @@ -22,8 +22,8 @@ #include "SDL_config.h" -#include "SDL_win32video.h" -#include "SDL_win32shape.h" +#include "SDL_windowsvideo.h" +#include "SDL_windowsshape.h" #include "SDL_syswm.h" #include "SDL_vkeys.h" #include "../../events/SDL_events_c.h" diff --git a/src/video/win32/SDL_win32events.h b/src/video/windows/SDL_windowsevents.h similarity index 92% rename from src/video/win32/SDL_win32events.h rename to src/video/windows/SDL_windowsevents.h index 18e880bf4..53cce81a3 100644 --- a/src/video/win32/SDL_win32events.h +++ b/src/video/windows/SDL_windowsevents.h @@ -21,8 +21,8 @@ */ #include "SDL_config.h" -#ifndef _SDL_win32events_h -#define _SDL_win32events_h +#ifndef _SDL_windowsevents_h +#define _SDL_windowsevents_h extern LPTSTR SDL_Appname; extern Uint32 SDL_Appstyle; @@ -32,6 +32,6 @@ extern LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); extern void WIN_PumpEvents(_THIS); -#endif /* _SDL_win32events_h */ +#endif /* _SDL_windowsevents_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/win32/SDL_win32gamma.c b/src/video/windows/SDL_windowsgamma.c similarity index 98% rename from src/video/win32/SDL_win32gamma.c rename to src/video/windows/SDL_windowsgamma.c index b94a7f596..d7b37b114 100644 --- a/src/video/win32/SDL_win32gamma.c +++ b/src/video/windows/SDL_windowsgamma.c @@ -21,7 +21,7 @@ */ #include "SDL_config.h" -#include "SDL_win32video.h" +#include "SDL_windowsvideo.h" int diff --git a/src/video/win32/SDL_win32gamma.h b/src/video/windows/SDL_windowsgamma.h similarity index 92% rename from src/video/win32/SDL_win32gamma.h rename to src/video/windows/SDL_windowsgamma.h index 25db4755d..cf1523470 100644 --- a/src/video/win32/SDL_win32gamma.h +++ b/src/video/windows/SDL_windowsgamma.h @@ -21,12 +21,12 @@ */ #include "SDL_config.h" -#ifndef _SDL_win32gamma_h -#define _SDL_win32gamma_h +#ifndef _SDL_windowsgamma_h +#define _SDL_windowsgamma_h extern int WIN_SetDisplayGammaRamp(_THIS, SDL_VideoDisplay * display, Uint16 * ramp); extern int WIN_GetDisplayGammaRamp(_THIS, SDL_VideoDisplay * display, Uint16 * ramp); -#endif /* _SDL_win32gamma_h */ +#endif /* _SDL_windowsgamma_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/win32/SDL_win32keyboard.c b/src/video/windows/SDL_windowskeyboard.c similarity index 99% rename from src/video/win32/SDL_win32keyboard.c rename to src/video/windows/SDL_windowskeyboard.c index c35e3564d..3e765ff36 100644 --- a/src/video/win32/SDL_win32keyboard.c +++ b/src/video/windows/SDL_windowskeyboard.c @@ -21,10 +21,10 @@ */ #include "SDL_config.h" -#include "SDL_win32video.h" +#include "SDL_windowsvideo.h" #include "../../events/SDL_keyboard_c.h" -#include "../../events/scancodes_win32.h" +#include "../../events/scancodes_windows.h" #include #include @@ -87,7 +87,7 @@ WIN_InitKeyboard(_THIS) } } - data->key_layout = win32_scancode_table; + data->key_layout = windows_scancode_table; data->ime_com_initialized = SDL_FALSE; data->ime_threadmgr = 0; @@ -150,10 +150,10 @@ WIN_UpdateKeymap() SDL_GetDefaultKeymap(keymap); - for (i = 0; i < SDL_arraysize(win32_scancode_table); i++) { + for (i = 0; i < SDL_arraysize(windows_scancode_table); i++) { /* Make sure this scancode is a valid character scancode */ - scancode = win32_scancode_table[i]; + scancode = windows_scancode_table[i]; if (scancode == SDL_SCANCODE_UNKNOWN || keymap[scancode] >= 127) { continue; } diff --git a/src/video/win32/SDL_win32keyboard.h b/src/video/windows/SDL_windowskeyboard.h similarity index 93% rename from src/video/win32/SDL_win32keyboard.h rename to src/video/windows/SDL_windowskeyboard.h index 670730bba..06fab46fb 100644 --- a/src/video/win32/SDL_win32keyboard.h +++ b/src/video/windows/SDL_windowskeyboard.h @@ -21,8 +21,8 @@ */ #include "SDL_config.h" -#ifndef _SDL_win32keyboard_h -#define _SDL_win32keyboard_h +#ifndef _SDL_windowskeyboard_h +#define _SDL_windowskeyboard_h extern BYTE alpha_scancodes[26]; extern BYTE keypad_scancodes[10]; @@ -37,6 +37,6 @@ extern void WIN_SetTextInputRect(_THIS, SDL_Rect *rect); extern SDL_bool IME_HandleMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM *lParam, struct SDL_VideoData *videodata); -#endif /* _SDL_win32keyboard_h */ +#endif /* _SDL_windowskeyboard_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/win32/SDL_win32modes.c b/src/video/windows/SDL_windowsmodes.c similarity index 99% rename from src/video/win32/SDL_win32modes.c rename to src/video/windows/SDL_windowsmodes.c index 992b61517..bd6bbf276 100644 --- a/src/video/win32/SDL_win32modes.c +++ b/src/video/windows/SDL_windowsmodes.c @@ -21,7 +21,7 @@ */ #include "SDL_config.h" -#include "SDL_win32video.h" +#include "SDL_windowsvideo.h" static SDL_bool diff --git a/src/video/win32/SDL_win32modes.h b/src/video/windows/SDL_windowsmodes.h similarity index 93% rename from src/video/win32/SDL_win32modes.h rename to src/video/windows/SDL_windowsmodes.h index c8ee4534e..1d0b3807d 100644 --- a/src/video/win32/SDL_win32modes.h +++ b/src/video/windows/SDL_windowsmodes.h @@ -21,8 +21,8 @@ */ #include "SDL_config.h" -#ifndef _SDL_win32modes_h -#define _SDL_win32modes_h +#ifndef _SDL_windowsmodes_h +#define _SDL_windowsmodes_h typedef struct { @@ -40,6 +40,6 @@ extern void WIN_GetDisplayModes(_THIS, SDL_VideoDisplay * display); extern int WIN_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode); extern void WIN_QuitModes(_THIS); -#endif /* _SDL_win32modes_h */ +#endif /* _SDL_windowsmodes_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/win32/SDL_win32mouse.c b/src/video/windows/SDL_windowsmouse.c similarity index 97% rename from src/video/win32/SDL_win32mouse.c rename to src/video/windows/SDL_windowsmouse.c index 093720bcb..16c86a6bb 100644 --- a/src/video/win32/SDL_win32mouse.c +++ b/src/video/windows/SDL_windowsmouse.c @@ -29,7 +29,7 @@ #include "SDL_config.h" -#include "SDL_win32video.h" +#include "SDL_windowsvideo.h" void WIN_InitMouse(_THIS) diff --git a/src/video/win32/SDL_win32mouse.h b/src/video/windows/SDL_windowsmouse.h similarity index 91% rename from src/video/win32/SDL_win32mouse.h rename to src/video/windows/SDL_windowsmouse.h index 278d4e832..ac3e56975 100644 --- a/src/video/win32/SDL_win32mouse.h +++ b/src/video/windows/SDL_windowsmouse.h @@ -21,12 +21,12 @@ */ #include "SDL_config.h" -#ifndef _SDL_win32mouse_h -#define _SDL_win32mouse_h +#ifndef _SDL_windowsmouse_h +#define _SDL_windowsmouse_h extern void WIN_InitMouse(_THIS); extern void WIN_QuitMouse(_THIS); -#endif /* _SDL_win32mouse_h */ +#endif /* _SDL_windowsmouse_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/win32/SDL_win32opengl.c b/src/video/windows/SDL_windowsopengl.c similarity index 99% rename from src/video/win32/SDL_win32opengl.c rename to src/video/windows/SDL_windowsopengl.c index 326ae53c0..0de7414be 100644 --- a/src/video/win32/SDL_win32opengl.c +++ b/src/video/windows/SDL_windowsopengl.c @@ -21,7 +21,7 @@ */ #include "SDL_config.h" -#include "SDL_win32video.h" +#include "SDL_windowsvideo.h" /* WGL implementation of SDL OpenGL support */ diff --git a/src/video/win32/SDL_win32opengl.h b/src/video/windows/SDL_windowsopengl.h similarity index 98% rename from src/video/win32/SDL_win32opengl.h rename to src/video/windows/SDL_windowsopengl.h index d3a938a4c..4229d2ab2 100644 --- a/src/video/win32/SDL_win32opengl.h +++ b/src/video/windows/SDL_windowsopengl.h @@ -21,8 +21,8 @@ */ #include "SDL_config.h" -#ifndef _SDL_win32opengl_h -#define _SDL_win32opengl_h +#ifndef _SDL_windowsopengl_h +#define _SDL_windowsopengl_h #if SDL_VIDEO_OPENGL_WGL @@ -121,6 +121,6 @@ extern void WIN_GL_DeleteContext(_THIS, SDL_GLContext context); #endif /* SDL_VIDEO_OPENGL_WGL */ -#endif /* _SDL_win32opengl_h */ +#endif /* _SDL_windowsopengl_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/win32/SDL_win32shape.c b/src/video/windows/SDL_windowsshape.c similarity index 98% rename from src/video/win32/SDL_win32shape.c rename to src/video/windows/SDL_windowsshape.c index 68350a572..3daf9c651 100644 --- a/src/video/win32/SDL_win32shape.c +++ b/src/video/windows/SDL_windowsshape.c @@ -22,8 +22,8 @@ #include #include "SDL_assert.h" -#include "SDL_win32shape.h" -#include "SDL_win32video.h" +#include "SDL_windowsshape.h" +#include "SDL_windowsvideo.h" SDL_WindowShaper* Win32_CreateShaper(SDL_Window * window) { diff --git a/src/video/win32/SDL_win32shape.h b/src/video/windows/SDL_windowsshape.h similarity index 93% rename from src/video/win32/SDL_win32shape.h rename to src/video/windows/SDL_windowsshape.h index e18a77ec0..51128bc73 100644 --- a/src/video/win32/SDL_win32shape.h +++ b/src/video/windows/SDL_windowsshape.h @@ -22,8 +22,8 @@ #include "SDL_config.h" -#ifndef _SDL_win32shape_h -#define _SDL_win32shape_h +#ifndef _SDL_windowsshape_h +#define _SDL_windowsshape_h #include "SDL_video.h" #include "SDL_shape.h" @@ -38,4 +38,4 @@ extern SDL_WindowShaper* Win32_CreateShaper(SDL_Window * window); extern int Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode); extern int Win32_ResizeWindowShape(SDL_Window *window); -#endif /* _SDL_win32shape_h */ +#endif /* _SDL_windowsshape_h */ diff --git a/src/video/win32/SDL_win32video.c b/src/video/windows/SDL_windowsvideo.c similarity index 97% rename from src/video/win32/SDL_win32video.c rename to src/video/windows/SDL_windowsvideo.c index eaa820eed..38f0a071e 100644 --- a/src/video/win32/SDL_win32video.c +++ b/src/video/windows/SDL_windowsvideo.c @@ -27,8 +27,8 @@ #include "../SDL_sysvideo.h" #include "../SDL_pixels_c.h" -#include "SDL_win32video.h" -#include "SDL_win32shape.h" +#include "SDL_windowsvideo.h" +#include "SDL_windowsshape.h" #include "SDL_d3drender.h" #include "SDL_gdirender.h" #include "SDL_gapirender.h" @@ -51,7 +51,7 @@ WIN_SetError(const char *prefix) } -/* WIN32 driver bootstrap functions */ +/* Windows driver bootstrap functions */ static int WIN_Available(void) @@ -221,11 +221,11 @@ WIN_CreateDevice(int devindex) return device; } -VideoBootStrap WIN32_bootstrap = { +VideoBootStrap WINDOWS_bootstrap = { #ifdef _WIN32_WCE "wince", "SDL WinCE video driver", WINCE_Available, WIN_CreateDevice #else - "win32", "SDL Win32/64 video driver", WIN_Available, WIN_CreateDevice + "windows", "SDL Win32/64 video driver", WIN_Available, WIN_CreateDevice #endif }; diff --git a/src/video/win32/SDL_win32video.h b/src/video/windows/SDL_windowsvideo.h similarity index 94% rename from src/video/win32/SDL_win32video.h rename to src/video/windows/SDL_windowsvideo.h index 0a8adcf00..f96abb8c4 100644 --- a/src/video/win32/SDL_win32video.h +++ b/src/video/windows/SDL_windowsvideo.h @@ -21,8 +21,8 @@ */ #include "SDL_config.h" -#ifndef _SDL_win32video_h -#define _SDL_win32video_h +#ifndef _SDL_windowsvideo_h +#define _SDL_windowsvideo_h #include "../SDL_sysvideo.h" @@ -59,14 +59,14 @@ #include "ddraw.h" #endif -#include "SDL_win32clipboard.h" -#include "SDL_win32events.h" -#include "SDL_win32gamma.h" -#include "SDL_win32keyboard.h" -#include "SDL_win32modes.h" -#include "SDL_win32mouse.h" -#include "SDL_win32opengl.h" -#include "SDL_win32window.h" +#include "SDL_windowsclipboard.h" +#include "SDL_windowsevents.h" +#include "SDL_windowsgamma.h" +#include "SDL_windowskeyboard.h" +#include "SDL_windowsmodes.h" +#include "SDL_windowsmouse.h" +#include "SDL_windowsopengl.h" +#include "SDL_windowswindow.h" #include "SDL_events.h" #ifdef UNICODE @@ -217,6 +217,6 @@ typedef struct SDL_VideoData TSFSink *ime_ippasink; } SDL_VideoData; -#endif /* _SDL_win32video_h */ +#endif /* _SDL_windowsvideo_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/win32/SDL_win32window.c b/src/video/windows/SDL_windowswindow.c similarity index 99% rename from src/video/win32/SDL_win32window.c rename to src/video/windows/SDL_windowswindow.c index e8a75899b..9a2ec5a63 100644 --- a/src/video/win32/SDL_win32window.c +++ b/src/video/windows/SDL_windowswindow.c @@ -25,10 +25,10 @@ #include "../SDL_pixels_c.h" #include "../../events/SDL_keyboard_c.h" -#include "SDL_win32video.h" -#include "SDL_win32window.h" +#include "SDL_windowsvideo.h" +#include "SDL_windowswindow.h" -/* This is included after SDL_win32video.h, which includes windows.h */ +/* This is included after SDL_windowsvideo.h, which includes windows.h */ #include "SDL_syswm.h" #include "SDL_gapirender.h" diff --git a/src/video/win32/SDL_win32window.h b/src/video/windows/SDL_windowswindow.h similarity index 96% rename from src/video/win32/SDL_win32window.h rename to src/video/windows/SDL_windowswindow.h index 43eeb01bc..1d006bf5b 100644 --- a/src/video/win32/SDL_win32window.h +++ b/src/video/windows/SDL_windowswindow.h @@ -21,8 +21,8 @@ */ #include "SDL_config.h" -#ifndef _SDL_win32window_h -#define _SDL_win32window_h +#ifndef _SDL_windowswindow_h +#define _SDL_windowswindow_h #ifdef _WIN32_WCE #define SHFS_SHOWTASKBAR 0x0001 @@ -61,6 +61,6 @@ extern void WIN_DestroyWindow(_THIS, SDL_Window * window); extern SDL_bool WIN_GetWindowWMInfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info); -#endif /* _SDL_win32window_h */ +#endif /* _SDL_windowswindow_h */ /* vi: set ts=4 sw=4 expandtab: */ diff --git a/src/video/win32/wmmsg.h b/src/video/windows/wmmsg.h similarity index 100% rename from src/video/win32/wmmsg.h rename to src/video/windows/wmmsg.h diff --git a/test/automated/rwops/TestSupportRWops_Generic.c b/test/automated/rwops/TestSupportRWops_Generic.c index 969e0612c..a4b366a34 100644 --- a/test/automated/rwops/TestSupportRWops_Generic.c +++ b/test/automated/rwops/TestSupportRWops_Generic.c @@ -2,7 +2,7 @@ * Customizations for specific platforms should go in alternative files. */ -// quiet win32 compiler warnings +// quiet windows compiler warnings #define _CRT_SECURE_NO_WARNINGS #include diff --git a/test/testfile.c b/test/testfile.c index 0480e9f9b..6657f40ee 100644 --- a/test/testfile.c +++ b/test/testfile.c @@ -1,7 +1,7 @@ /* sanity tests on SDL_rwops.c (usefull for alternative implementations of stdio rwops) */ -// quiet win32 compiler warnings +// quiet windows compiler warnings #define _CRT_NONSTDC_NO_WARNINGS #include diff --git a/test/testgesture.c b/test/testgesture.c index 0667c539e..29f7106f0 100644 --- a/test/testgesture.c +++ b/test/testgesture.c @@ -19,14 +19,14 @@ #define PRIu32 "u" #endif #ifndef PRIs64 -#ifdef __WIN32__ +#ifdef __WINDOWS__ #define PRIs64 "I64" #else #define PRIs64 "lld" #endif #endif #ifndef PRIu64 -#ifdef __WIN32__ +#ifdef __WINDOWS__ #define PRIu64 "I64u" #else #define PRIu64 "llu" diff --git a/test/testnative.c b/test/testnative.c index 84017d5fd..bf30670b4 100644 --- a/test/testnative.c +++ b/test/testnative.c @@ -10,8 +10,8 @@ #define MAX_SPEED 1 static NativeWindowFactory *factories[] = { -#ifdef TEST_NATIVE_WIN32 - &Win32WindowFactory, +#ifdef TEST_NATIVE_WINDOWS + &WindowsWindowFactory, #endif #ifdef TEST_NATIVE_X11 &X11WindowFactory, diff --git a/test/testnative.h b/test/testnative.h index 2e049a126..9060feb4f 100644 --- a/test/testnative.h +++ b/test/testnative.h @@ -15,9 +15,9 @@ typedef struct void (*DestroyNativeWindow) (void *window); } NativeWindowFactory; -#ifdef SDL_VIDEO_DRIVER_WIN32 -#define TEST_NATIVE_WIN32 -extern NativeWindowFactory Win32WindowFactory; +#ifdef SDL_VIDEO_DRIVER_WINDOWS +#define TEST_NATIVE_WINDOWS +extern NativeWindowFactory WindowsWindowFactory; #endif #ifdef SDL_VIDEO_DRIVER_X11 diff --git a/test/testnativew32.c b/test/testnativew32.c index e81790682..af9833954 100644 --- a/test/testnativew32.c +++ b/test/testnativew32.c @@ -1,15 +1,15 @@ #include "testnative.h" -#ifdef TEST_NATIVE_WIN32 +#ifdef TEST_NATIVE_WINDOWS -static void *CreateWindowWin32(int w, int h); -static void DestroyWindowWin32(void *window); +static void *CreateWindowNative(int w, int h); +static void DestroyWindowNative(void *window); -NativeWindowFactory Win32WindowFactory = { - "win32", - CreateWindowWin32, - DestroyWindowWin32 +NativeWindowFactory WindowsWindowFactory = { + "windows", + CreateWindowNative, + DestroyWindowNative }; LRESULT CALLBACK @@ -29,7 +29,7 @@ WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) } static void * -CreateWindowWin32(int w, int h) +CreateWindowNative(int w, int h) { HWND hwnd; WNDCLASS wc; @@ -67,7 +67,7 @@ CreateWindowWin32(int w, int h) } static void -DestroyWindowWin32(void *window) +DestroyWindowNative(void *window) { DestroyWindow((HWND) window); }