zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 06:42:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed Class identifier workaround from Cocoa backend

Browse source
This commit is contained in:
alexey.lysiuk 2018-06-30 11:41:51 +03:00
parent 907ce777a3
commit 1d937b9f3c
4 changed files with 0 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/posix/cocoa/i_input.mm
View file

@ -35,9 +35,6 @@
#import <Carbon/Carbon.h> #import <Carbon/Carbon.h>
// Avoid collision between DObject class and Objective-C
#define Class ObjectClass
#include "c_console.h" #include "c_console.h"
#include "c_cvars.h" #include "c_cvars.h"
#include "c_dispatch.h" #include "c_dispatch.h"
@ -49,8 +46,6 @@
#include "v_video.h" #include "v_video.h"
#include "events.h" #include "events.h"
#undef Class
EXTERN_CVAR(Int, m_use_mouse) EXTERN_CVAR(Int, m_use_mouse)

5
src/posix/cocoa/i_main.mm
View file

@ -36,9 +36,6 @@
#include <sys/sysctl.h> #include <sys/sysctl.h>
// Avoid collision between DObject class and Objective-C
#define Class ObjectClass
#include "c_console.h" #include "c_console.h"
#include "c_cvars.h" #include "c_cvars.h"
#include "cmdlib.h" #include "cmdlib.h"
@ -48,8 +45,6 @@
#include "st_console.h" #include "st_console.h"
#include "version.h" #include "version.h"
#undef Class
#define ZD_UNUSED(VARIABLE) ((void)(VARIABLE)) #define ZD_UNUSED(VARIABLE) ((void)(VARIABLE))

5
src/posix/cocoa/i_video.mm
View file

@ -35,9 +35,6 @@
#include "i_common.h" #include "i_common.h"
// Avoid collision between DObject class and Objective-C
#define Class ObjectClass
#include "bitmap.h" #include "bitmap.h"
#include "c_dispatch.h" #include "c_dispatch.h"
#include "doomstat.h" #include "doomstat.h"
@ -55,8 +52,6 @@
#include "gl/system/gl_framebuffer.h" #include "gl/system/gl_framebuffer.h"
#include "gl/textures/gl_samplers.h" #include "gl/textures/gl_samplers.h"
#undef Class
@implementation NSWindow(ExitAppOnClose) @implementation NSWindow(ExitAppOnClose)

5
src/posix/osx/iwadpicker_cocoa.mm
View file

@ -33,9 +33,6 @@
** **
*/ */
// Avoid collision between DObject class and Objective-C
#define Class ObjectClass
#include "cmdlib.h" #include "cmdlib.h"
#include "d_main.h" #include "d_main.h"
#include "version.h" #include "version.h"
@ -44,8 +41,6 @@
#include "m_misc.h" #include "m_misc.h"
#include "gameconfigfile.h" #include "gameconfigfile.h"
#undef Class
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#include <wordexp.h> #include <wordexp.h>