diff options
| -rw-r--r-- | cairomm/fontface.h | 8 | ||||
| -rw-r--r-- | cairomm/surface.h | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/cairomm/fontface.h b/cairomm/fontface.h index 007b40f..464332a 100644 --- a/cairomm/fontface.h +++ b/cairomm/fontface.h @@ -25,14 +25,6 @@ #include <cairomm/types.h> #include <cairomm/refptr.h> -/* following is required for OS X */ - -#ifdef nil -#undef nil -#endif - -/* end OS X */ - #include <cairo.h> #ifdef CAIRO_HAS_FT_FONT #include <cairo-ft.h> diff --git a/cairomm/surface.h b/cairomm/surface.h index 64412cb..379742d 100644 --- a/cairomm/surface.h +++ b/cairomm/surface.h @@ -26,11 +26,14 @@ #ifdef nil #undef nil +#include <sigc++/slot.h> +#define nil NULL +#else +#include <sigc++/slot.h> #endif /* end OS X */ -#include <sigc++/slot.h> #include <cairomm/enums.h> #include <cairomm/exception.h> #include <cairomm/device.h> |