diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:21:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-03-31 20:21:13 +0200 |
| commit | f4e50548b0d41f5b4e6faae3ddc7283dd1a5dd6c (patch) | |
| tree | 50b3bae39301c2ef89bbbabdb843a62d679e034e /package/firefox/patches/patch-gfx_qcms_qcmstypes_h | |
| parent | c2bd3a43342e37a05a97e12581dd2bd52993877a (diff) | |
I am to tupid for git, today.
Revert "Revert "fix conflict, autoseect libgcj""
This reverts commit c2bd3a43342e37a05a97e12581dd2bd52993877a.
Diffstat (limited to 'package/firefox/patches/patch-gfx_qcms_qcmstypes_h')
| -rw-r--r-- | package/firefox/patches/patch-gfx_qcms_qcmstypes_h | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h b/package/firefox/patches/patch-gfx_qcms_qcmstypes_h deleted file mode 100644 index 80f68661a..000000000 --- a/package/firefox/patches/patch-gfx_qcms_qcmstypes_h +++ /dev/null @@ -1,26 +0,0 @@ ---- 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 <sys/int_types.h> - #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 <stdint.h> - #ifdef __OS2__ - /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ - #include <stdlib.h> - #elif defined(__FreeBSD__) - /* FreeBSD typedefs uintptr_t in /usr/include/sys/types.h */ --#else --typedef PRUptrdiff uintptr_t; - #endif - #endif - |