From 0df1d8b6958f5f6639ddb5d41d5ceef235ccae01 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Tue, 16 Mar 2010 09:08:27 +0000
Subject: [PATCH] Conflict with variable id used in Fl_Images.H and others was
 removed, so #define id id_ hack now useless.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7274 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_cocoa.mm | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 5c7f65998..69d7eb47e 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -94,19 +94,8 @@ extern "C" {
 #include <FL/x.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Tooltip.H>
-#if __GNUC__ == 3 
-// because Fl_Image.H, included by Fl_Sys_Menu_Bar.H, uses a private variable name id 
-// that's illegal under GCC 3 -x -objective-c++
-#define id id_
-// because Fl_Bitmap.H and Fl_Pixmap.H included by Fl_Printer.H don't compile with gcc3 and objective-c++
-#define Fl_Bitmap_H
-#define Fl_Pixmap_H
-#endif
 #include <FL/Fl_Sys_Menu_Bar.H>
 #include <FL/Fl_Printer.H>
-#ifdef id
-#undef id
-#endif
 #include <FL/Fl_Input_.H>
 #include <stdio.h>
 #include <stdlib.h>