mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conflict with variable id used in Fl_Images.H and others was removed, so #define id id_ hack now useless.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@7274 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2010-03-16 09:08:27 +00:00
parent 186a8f0ff1
commit 0df1d8b695
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Fl_cocoa.mm
View File

@ -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>