diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2008-11-13 10:50:41 +0100 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2008-11-13 10:50:41 +0100 |
| commit | 279a7cef349cf5aa87cdeacb9424413f51117fe8 (patch) | |
| tree | 9dcd01eb83f86dce2c3e4d4e917cd966ebeef6ad | |
| parent | 0a682034a04fa7fc1407e7bc093ae01f4b385ad7 (diff) | |
[os2] Fix includes
Patch from Dave Yeo to make cairo-os2.h include os2.h directly so the
header is standalone.
| -rw-r--r-- | src/cairo-os2-private.h | 11 | ||||
| -rw-r--r-- | src/cairo-os2-surface.c | 5 | ||||
| -rw-r--r-- | src/cairo-os2.h | 8 |
3 files changed, 8 insertions, 16 deletions
diff --git a/src/cairo-os2-private.h b/src/cairo-os2-private.h index 5fa28295..e71a6dc9 100644 --- a/src/cairo-os2-private.h +++ b/src/cairo-os2-private.h @@ -41,17 +41,6 @@ #include "cairo-os2.h" #include "cairoint.h" -#define INCL_DOS -#define INCL_DOSSEMAPHORES -#define INCL_DOSERRORS -#define INCL_WIN -#define INCL_GPI -#ifdef __WATCOMC__ -# include <os2.h> -#else -# include <os2emx.h> -#endif - typedef struct _cairo_os2_surface { cairo_surface_t base; diff --git a/src/cairo-os2-surface.c b/src/cairo-os2-surface.c index bff649ae..e4cef052 100644 --- a/src/cairo-os2-surface.c +++ b/src/cairo-os2-surface.c @@ -43,11 +43,6 @@ #include <float.h> #ifdef BUILD_CAIRO_DLL -# define INCL_WIN -# define INCL_GPI -# define INCL_DOS -# define INCL_DOSERRORS -# include <os2emx.h> # include "cairo-os2.h" # ifndef __WATCOMC__ # include <emx/startup.h> diff --git a/src/cairo-os2.h b/src/cairo-os2.h index d0a13e47..17f02634 100644 --- a/src/cairo-os2.h +++ b/src/cairo-os2.h @@ -38,6 +38,14 @@ #ifndef _CAIRO_OS2_H_ #define _CAIRO_OS2_H_ +#define INCL_DOS +#define INCL_DOSSEMAPHORES +#define INCL_DOSERRORS +#define INCL_WIN +#define INCL_GPI + +#include <os2.h> + #include "cairo.h" CAIRO_BEGIN_DECLS |