[cairo-commit] Branch '1.8' - 2 commits - src/cairo-os2.h src/cairo-os2-private.h src/cairo-os2-surface.c

[Chris Wilson]

 src/cairo-os2-private.h |   11 -----------
 src/cairo-os2-surface.c |    5 -----
 src/cairo-os2.h         |    8 ++++++++
 3 files changed, 8 insertions(+), 16 deletions(-)

New commits:
commit f5634818f1e5cc0adaa326662c099a75f4e615eb
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Nov 13 14:56:38 2008 +0000

    [os2] Move include cairo.h before os2.h
    
    The defines need to come first, but we specify that cairo.h is the first
    header file to be included by files.

diff --git a/src/cairo-os2.h b/src/cairo-os2.h
index 17f0263..0d18674 100644
--- a/src/cairo-os2.h
+++ b/src/cairo-os2.h
@@ -44,10 +44,10 @@
 #define INCL_WIN
 #define INCL_GPI
 
-#include <os2.h>
-
 #include "cairo.h"
 
+#include <os2.h>
+
 CAIRO_BEGIN_DECLS
 
 /* The OS/2 Specific Cairo API */
commit 2f0f9a1a593db43dd04507c5989cd0af4b1486de
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Nov 13 10:50:41 2008 +0100

    [os2] Fix includes
    
    Patch from Dave Yeo to make cairo-os2.h include os2.h directly so the
    header is standalone.

diff --git a/src/cairo-os2-private.h b/src/cairo-os2-private.h
index 5fa2829..e71a6dc 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 bff649a..e4cef05 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 d0a13e4..17f0263 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