diff --git a/source/lib/ogl.cpp b/source/lib/ogl.cpp index f00e666ebe..24ee50b979 100644 --- a/source/lib/ogl.cpp +++ b/source/lib/ogl.cpp @@ -34,7 +34,7 @@ # if OS_WIN # include -# elif !OS_MACOSX && !OS_MAC +# elif !OS_MACOSX # include # if defined(SDL_VIDEO_DRIVER_X11) # include @@ -220,7 +220,7 @@ bool ogl_HaveExtension(const char* ext) static int GLVersion; #if OS_WIN static int WGLVersion; -#elif !CONFIG2_GLES && !OS_MACOSX && !OS_MAC +#elif !CONFIG2_GLES && !OS_MACOSX #if defined(SDL_VIDEO_DRIVER_X11) static int GLXVersion; #endif @@ -428,7 +428,7 @@ bool ogl_SquelchError(GLenum err_to_ignore) #if OS_WIN bool ogl_Init(void* (load)(const char*), void* hdc) -#elif !CONFIG2_GLES && !OS_MACOSX && !OS_MAC +#elif !CONFIG2_GLES && !OS_MACOSX bool ogl_Init(void* (load)(const char*), void* display, int subsystem) #else bool ogl_Init(void* (load)(const char*)) @@ -458,7 +458,7 @@ bool ogl_Init(void* (load)(const char*)) LOAD_ERROR("Failed to load WGL functions."); return false; } -# elif !OS_MACOSX && !OS_MAC +# elif !OS_MACOSX const SDL_SYSWM_TYPE sysWMType = static_cast(subsystem); # if defined(SDL_VIDEO_DRIVER_X11) if (sysWMType == SDL_SYSWM_X11) @@ -522,7 +522,7 @@ void ogl_SetVsyncEnabled(bool enabled) #if !CONFIG2_GLES && OS_WIN if (ogl_HaveExtension("WGL_EXT_swap_control")) wglSwapIntervalEXT(interval); -#elif !CONFIG2_GLES && !OS_MACOSX && !OS_MAC +#elif !CONFIG2_GLES && !OS_MACOSX #if defined(SDL_VIDEO_DRIVER_X11) if (GLXVersion && ogl_HaveExtension("GLX_SGI_swap_control")) glXSwapIntervalSGI(interval); diff --git a/source/lib/ogl.h b/source/lib/ogl.h index 2c843bd2a7..a05c71ab59 100644 --- a/source/lib/ogl.h +++ b/source/lib/ogl.h @@ -46,7 +46,7 @@ **/ #if OS_WIN extern bool ogl_Init(void* (load)(const char*), void* hdc); -#elif !OS_MACOSX && !OS_MAC && !CONFIG2_GLES +#elif !OS_MACOSX && !CONFIG2_GLES extern bool ogl_Init(void* (load)(const char*), void* display, int subsystem); #else extern bool ogl_Init(void* (load)(const char*)); diff --git a/source/lib/sysdep/os.h b/source/lib/sysdep/os.h index 7b09464de9..9a3ae14777 100644 --- a/source/lib/sysdep/os.h +++ b/source/lib/sysdep/os.h @@ -91,12 +91,6 @@ #else # define OS_BEOS 0 #endif -// Mac OS 9 or below -#if defined(macintosh) -# define OS_MAC 1 -#else -# define OS_MAC 0 -#endif // Amiga #if defined(AMIGA) # define OS_AMIGA 1 diff --git a/source/scriptinterface/tests/test_Module.h b/source/scriptinterface/tests/test_Module.h index b9417cbbba..cbfaeb1cc4 100644 --- a/source/scriptinterface/tests/test_Module.h +++ b/source/scriptinterface/tests/test_Module.h @@ -29,13 +29,13 @@ #include "scriptinterface/ScriptContext.h" #include "scriptinterface/ScriptInterface.h" -#if OS_MAC || OS_MACOSX +#if OS_MACOSX #include #endif #if OS_LINUX #include #endif -#if OS_WIN || OS_WIN64 || OS_MAC || OS_MACOSX +#if OS_WIN || OS_WIN64 || OS_MACOSX #include #endif #include @@ -47,7 +47,7 @@ namespace { void ClearFromCache(const VfsPath& path) { -#if OS_BSD && !(OS_MAC || OS_MACOSX) +#if OS_BSD && !OS_MACOSX TS_SKIP("On BSD hotload isn't implemented."); #endif @@ -57,7 +57,7 @@ void ClearFromCache(const VfsPath& path) PDirWatch dirWatch; dir_watch_Add((file.Parent() / "").string8(), dirWatch); -#if OS_WIN || OS_WIN64 || OS_MAC || OS_MACOSX +#if OS_WIN || OS_WIN64 || OS_MACOSX std::filesystem::last_write_time(file.string8(), std::filesystem::file_time_type::clock::now()); #endif @@ -71,7 +71,7 @@ void ClearFromCache(const VfsPath& path) while (status == INFO::SKIPPED) { status = ReloadChangedFiles(); -#if OS_MAC || OS_MACOSX +#if OS_MACOSX // Console apps don't have a run loop, so we need to wait // a bit for the file watcher to catch up. CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.1, true);