From c2bd3a43342e37a05a97e12581dd2bd52993877a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 31 Mar 2011 20:20:09 +0200 Subject: Revert "fix conflict, autoseect libgcj" This reverts commit ac46bdeef28bc2b65e1880884a79257c28e423a7, reversing changes made to 418fb3668f7140cc3e2ba07c354fe0d9bbb47d04. --- package/firefox/patches/patch-gfx_qcms_qcmstypes_h | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 package/firefox/patches/patch-gfx_qcms_qcmstypes_h (limited to 'package/firefox/patches/patch-gfx_qcms_qcmstypes_h') diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h new file mode 100644 index 000000000..80f68661a --- /dev/null +++ b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h @@ -0,0 +1,26 @@ +--- mozilla-1.9.2.orig/gfx/qcms/qcmstypes.h 2010-04-02 18:02:27.000000000 +0200 ++++ mozilla-1.9.2/gfx/qcms/qcmstypes.h 2010-04-30 17:58:33.490975825 +0200 +@@ -11,22 +11,12 @@ + /* int_types.h gets included somehow, so avoid redefining the types differently */ + #include + #else +-typedef PRInt8 int8_t; +-typedef PRUint8 uint8_t; +-typedef PRInt16 int16_t; +-typedef PRUint16 uint16_t; +-typedef PRInt32 int32_t; +-typedef PRUint32 uint32_t; +-typedef PRInt64 int64_t; +-typedef PRUint64 uint64_t; +- ++#include + #ifdef __OS2__ + /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ + #include + #elif defined(__FreeBSD__) + /* FreeBSD typedefs uintptr_t in /usr/include/sys/types.h */ +-#else +-typedef PRUptrdiff uintptr_t; + #endif + #endif + -- cgit v1.2.3