From 21b290f70d0389fbd49b581327881bdd96e063cb Mon Sep 17 00:00:00 2001
From: Peter Weilbacher <mozilla@weilbacher.org>
Date: Fri, 28 Nov 2008 00:06:22 +0100
Subject: [PATCH] [OS/2] cairo-os2 build fix that was already applied in
 upstream cairo

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

diff --git a/gfx/cairo/cairo/src/cairo-os2-private.h b/gfx/cairo/cairo/src/cairo-os2-private.h
index 5fa282951e9c..e71a6dc9431c 100644
--- a/gfx/cairo/cairo/src/cairo-os2-private.h
+++ b/gfx/cairo/cairo/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/gfx/cairo/cairo/src/cairo-os2-surface.c b/gfx/cairo/cairo/src/cairo-os2-surface.c
index bff649ae812d..e4cef05246cd 100644
--- a/gfx/cairo/cairo/src/cairo-os2-surface.c
+++ b/gfx/cairo/cairo/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/gfx/cairo/cairo/src/cairo-os2.h b/gfx/cairo/cairo/src/cairo-os2.h
index d0a13e47f5fe..0d18674b2ae3 100644
--- a/gfx/cairo/cairo/src/cairo-os2.h
+++ b/gfx/cairo/cairo/src/cairo-os2.h
@@ -38,8 +38,16 @@
 #ifndef _CAIRO_OS2_H_
 #define _CAIRO_OS2_H_
 
+#define INCL_DOS
+#define INCL_DOSSEMAPHORES
+#define INCL_DOSERRORS
+#define INCL_WIN
+#define INCL_GPI
+
 #include "cairo.h"
 
+#include <os2.h>
+
 CAIRO_BEGIN_DECLS
 
 /* The OS/2 Specific Cairo API */