diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-08-08 22:36:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-08-08 22:36:32 +0000 |
| commit | bcc929a5b6760660d307c30da58efdd24c9411fb (patch) | |
| tree | 2394156d6c1a1f8f120c7d7f7cdd4bc6f98f0c7a /gtk2_ardour/cocoacarbon.mm | |
| parent | 9c6449567d2dc6ce65b99fc1f9e94fc11cccc743 (diff) | |
waf build works on OS X ; new bindings file and processing system in place for mnemonic-us
git-svn-id: svn://localhost/ardour2/branches/3.0@5498 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/cocoacarbon.mm')
| -rw-r--r-- | gtk2_ardour/cocoacarbon.mm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gtk2_ardour/cocoacarbon.mm b/gtk2_ardour/cocoacarbon.mm index e4f833dd26..84e34bd74d 100644 --- a/gtk2_ardour/cocoacarbon.mm +++ b/gtk2_ardour/cocoacarbon.mm @@ -21,6 +21,14 @@ #undef YES // stupid, stupid gtkmm and/or NSObjC #undef NO // ditto +#ifdef GTKOSX +#include <objc/objc.h> +#ifdef nil + /*Stupid OS X defining nil*/ +#undef nil +#endif +#endif + #include "ardour_ui.h" #include "actions.h" #include "opts.h" |