diff options
| author | Manolo Gouy <Manolo> | 2010-03-16 09:08:27 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2010-03-16 09:08:27 +0000 |
| commit | 0df1d8b6958f5f6639ddb5d41d5ceef235ccae01 (patch) | |
| tree | 751fb40985ac43ee1d4c04ed6223fb9c5b38efc2 /src | |
| parent | 186a8f0ff123d3912e9993787f339750b74b0738 (diff) | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_cocoa.mm | 11 |
1 files changed, 0 insertions, 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> |