From 3403e7277e98f7d9a6577d57856bc6e23392d542 Mon Sep 17 00:00:00 2001
From: Jeff Muizelaar <jmuizelaar@mozilla.com>
Date: Sat, 11 Apr 2009 09:53:40 +0200
Subject: [PATCH] Bug 487566 - OS/2 problems to build qcms;
 r=mozilla@Weilbacher.org

---
 gfx/qcms/iccread.c   | 4 ++++
 gfx/qcms/qcmsint.h   | 1 -
 gfx/qcms/qcmstypes.h | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/gfx/qcms/iccread.c b/gfx/qcms/iccread.c
index 6d415bbd5b5..2b84f13099a 100644
--- a/gfx/qcms/iccread.c
+++ b/gfx/qcms/iccread.c
@@ -35,6 +35,10 @@ typedef uint16_t __be16;
 #define LITTLE_ENDIAN
 #endif
 
+#ifdef __OS2__
+#define LITTLE_ENDIAN
+#endif
+
 #if !defined(BIG_ENDIAN) && !defined(LITTLE_ENDIAN)
 #error Unknown endianess
 #endif
diff --git a/gfx/qcms/qcmsint.h b/gfx/qcms/qcmsint.h
index a85f278ed5a..b962063e136 100644
--- a/gfx/qcms/qcmsint.h
+++ b/gfx/qcms/qcmsint.h
@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include "qcms.h"
 #include "qcmstypes.h"
 
diff --git a/gfx/qcms/qcmstypes.h b/gfx/qcms/qcmstypes.h
index 65bc7dee904..6ecbee4ec5f 100644
--- a/gfx/qcms/qcmstypes.h
+++ b/gfx/qcms/qcmstypes.h
@@ -13,7 +13,13 @@ typedef PRInt32 int32_t;
 typedef PRUint32 uint32_t;
 typedef PRInt64 int64_t;
 typedef PRUint64 uint64_t;
+
+#ifdef __OS2__
+/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
+#include <stdlib.h>
+#else
 typedef PRUptrdiff uintptr_t;
+#endif
 
 #else