Author: manolo Date: 2010-03-16 02:08:27 -0700 (Tue, 16 Mar 2010) New Revision: 7274 Log: Conflict with variable id used in Fl_Images.H and others was removed, so #define id id_ hack now useless.
Modified: branches/branch-1.3/src/Fl_cocoa.mm Modified: branches/branch-1.3/src/Fl_cocoa.mm =================================================================== --- branches/branch-1.3/src/Fl_cocoa.mm 2010-03-15 23:47:47 UTC (rev 7273) +++ branches/branch-1.3/src/Fl_cocoa.mm 2010-03-16 09:08:27 UTC (rev 7274) @@ -94,19 +94,8 @@ #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> _______________________________________________ fltk-commit mailing list [email protected] http://lists.easysw.com/mailman/listinfo/fltk-commit
