From 1d937b9f3c83b1af4f6a933174a1331ee3bbbc68 Mon Sep 17 00:00:00 2001
From: "alexey.lysiuk" <alexey.lysiuk@gmail.com>
Date: Sat, 30 Jun 2018 11:41:51 +0300
Subject: [PATCH] - removed Class identifier workaround from Cocoa backend

---
 src/posix/cocoa/i_input.mm        | 5 -----
 src/posix/cocoa/i_main.mm         | 5 -----
 src/posix/cocoa/i_video.mm        | 5 -----
 src/posix/osx/iwadpicker_cocoa.mm | 5 -----
 4 files changed, 20 deletions(-)

diff --git a/src/posix/cocoa/i_input.mm b/src/posix/cocoa/i_input.mm
index c6fc86e441..b019e56ff7 100644
--- a/src/posix/cocoa/i_input.mm
+++ b/src/posix/cocoa/i_input.mm
@@ -35,9 +35,6 @@
 
 #import <Carbon/Carbon.h>
 
-// Avoid collision between DObject class and Objective-C
-#define Class ObjectClass
-
 #include "c_console.h"
 #include "c_cvars.h"
 #include "c_dispatch.h"
@@ -49,8 +46,6 @@
 #include "v_video.h"
 #include "events.h"
 
-#undef Class
-
 
 EXTERN_CVAR(Int, m_use_mouse)
 
diff --git a/src/posix/cocoa/i_main.mm b/src/posix/cocoa/i_main.mm
index e1b388d3d4..66d610af7e 100644
--- a/src/posix/cocoa/i_main.mm
+++ b/src/posix/cocoa/i_main.mm
@@ -36,9 +36,6 @@
 
 #include <sys/sysctl.h>
 
-// Avoid collision between DObject class and Objective-C
-#define Class ObjectClass
-
 #include "c_console.h"
 #include "c_cvars.h"
 #include "cmdlib.h"
@@ -48,8 +45,6 @@
 #include "st_console.h"
 #include "version.h"
 
-#undef Class
-
 
 #define ZD_UNUSED(VARIABLE) ((void)(VARIABLE))
 
diff --git a/src/posix/cocoa/i_video.mm b/src/posix/cocoa/i_video.mm
index c6ee90eb19..0477772fb5 100644
--- a/src/posix/cocoa/i_video.mm
+++ b/src/posix/cocoa/i_video.mm
@@ -35,9 +35,6 @@
 
 #include "i_common.h"
 
-// Avoid collision between DObject class and Objective-C
-#define Class ObjectClass
-
 #include "bitmap.h"
 #include "c_dispatch.h"
 #include "doomstat.h"
@@ -55,8 +52,6 @@
 #include "gl/system/gl_framebuffer.h"
 #include "gl/textures/gl_samplers.h"
 
-#undef Class
-
 
 @implementation NSWindow(ExitAppOnClose)
 
diff --git a/src/posix/osx/iwadpicker_cocoa.mm b/src/posix/osx/iwadpicker_cocoa.mm
index 2b25f680e3..2e42b4c5ae 100644
--- a/src/posix/osx/iwadpicker_cocoa.mm
+++ b/src/posix/osx/iwadpicker_cocoa.mm
@@ -33,9 +33,6 @@
  **
  */
 
-// Avoid collision between DObject class and Objective-C
-#define Class ObjectClass
-
 #include "cmdlib.h"
 #include "d_main.h"
 #include "version.h"
@@ -44,8 +41,6 @@
 #include "m_misc.h"
 #include "gameconfigfile.h"
 
-#undef Class
-
 #include <Cocoa/Cocoa.h>
 #include <wordexp.h>