[SVN-Commit] r1133 - in trunk: mail/thunderbird-esr/files mail/thunderbird/files www/firefox-esr/files www/firefox-nightly/files www/firefox/files www/seamonkey/files
svn-freebsd-gecko at chruetertee.ch
svn-freebsd-gecko at chruetertee.ch
Wed Jan 9 00:34:37 UTC 2013
Author: jbeich
Date: Wed Jan 9 00:34:22 2013
New Revision: 1133
Log:
oops, r1112 broke build on i386
Reported by: flo
Added:
trunk/mail/thunderbird-esr/files/patch-bug828003
trunk/mail/thunderbird/files/patch-bug828003
trunk/www/firefox-esr/files/patch-bug828003
trunk/www/firefox-nightly/files/patch-bug828003
trunk/www/firefox/files/patch-bug828003
trunk/www/seamonkey/files/patch-bug828003
Deleted:
trunk/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h
trunk/mail/thunderbird/files/patch-mozilla-gfx-qcms-qcmstypes.h
trunk/www/firefox-esr/files/patch-gfx-qcms-qcmstypes.h
trunk/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h
trunk/www/firefox/files/patch-gfx-qcms-qcmstypes.h
trunk/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h
Added: trunk/mail/thunderbird-esr/files/patch-bug828003
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird-esr/files/patch-bug828003 Wed Jan 9 00:34:22 2013 (r1133)
@@ -0,0 +1,36 @@
+--- mozilla/gfx/qcms/qcmstypes.h
++++ mozilla/gfx/qcms/qcmstypes.h
+@@ -7,30 +7,12 @@
+ #include "mozilla/StandardInteger.h"
+
+ /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
++/* stdint.h defines int*_t and uintptr_t */
+
+-#if defined (__SVR4) && defined (__sun)
+-/* int_types.h gets included somehow, so avoid redefining the types differently */
+-#include <sys/int_types.h>
+-#elif defined (_AIX)
++#if defined (_AIX)
+ #include <sys/types.h>
+-#elif defined(__OpenBSD__)
+-#include <inttypes.h>
+-#elif !defined(ANDROID)
+-typedef int8_t int8_t;
+-typedef uint8_t uint8_t;
+-typedef int16_t int16_t;
+-typedef uint16_t uint16_t;
+-typedef int32_t int32_t;
+-typedef uint32_t uint32_t;
+-typedef int64_t int64_t;
+-typedef uint64_t uint64_t;
+-
+-#ifdef __OS2__
+-/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
++#elif __OS2__
+ #include <stdlib.h>
+-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
+-typedef PRUptrdiff uintptr_t;
+-#endif
+ #endif
+
+ #else // MOZ_QCMS
Deleted: trunk/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h Wed Jan 9 00:34:22 2013 (r1132)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- mozilla/gfx/qcms/qcmstypes.h~
-+++ mozilla/gfx/qcms/qcmstypes.h
-@@ -8,6 +8,13 @@
-
- /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
-
-+#ifdef __FreeBSD__
-+# include <osreldate.h>
-+# if __FreeBSD_version < 900037 && defined(_INTPTR_T_DECLARED)
-+# define _UINTPTR_T_DEFINED // for old stdint.h
-+# endif
-+#endif
-+
- #if defined (__SVR4) && defined (__sun)
- /* int_types.h gets included somehow, so avoid redefining the types differently */
- #include <sys/int_types.h>
Added: trunk/mail/thunderbird/files/patch-bug828003
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/mail/thunderbird/files/patch-bug828003 Wed Jan 9 00:34:22 2013 (r1133)
@@ -0,0 +1,36 @@
+--- mozilla/gfx/qcms/qcmstypes.h
++++ mozilla/gfx/qcms/qcmstypes.h
+@@ -7,30 +7,12 @@
+ #include "mozilla/StandardInteger.h"
+
+ /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
++/* stdint.h defines int*_t and uintptr_t */
+
+-#if defined (__SVR4) && defined (__sun)
+-/* int_types.h gets included somehow, so avoid redefining the types differently */
+-#include <sys/int_types.h>
+-#elif defined (_AIX)
++#if defined (_AIX)
+ #include <sys/types.h>
+-#elif defined(__OpenBSD__)
+-#include <inttypes.h>
+-#elif !defined(ANDROID)
+-typedef int8_t int8_t;
+-typedef uint8_t uint8_t;
+-typedef int16_t int16_t;
+-typedef uint16_t uint16_t;
+-typedef int32_t int32_t;
+-typedef uint32_t uint32_t;
+-typedef int64_t int64_t;
+-typedef uint64_t uint64_t;
+-
+-#ifdef __OS2__
+-/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
++#elif __OS2__
+ #include <stdlib.h>
+-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
+-typedef unsigned long uintptr_t;
+-#endif
+ #endif
+
+ #else // MOZ_QCMS
Deleted: trunk/mail/thunderbird/files/patch-mozilla-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-gfx-qcms-qcmstypes.h Wed Jan 9 00:34:22 2013 (r1132)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- mozilla/gfx/qcms/qcmstypes.h~
-+++ mozilla/gfx/qcms/qcmstypes.h
-@@ -8,6 +8,13 @@
-
- /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
-
-+#ifdef __FreeBSD__
-+# include <osreldate.h>
-+# if __FreeBSD_version < 900037 && defined(_INTPTR_T_DECLARED)
-+# define _UINTPTR_T_DEFINED // for old stdint.h
-+# endif
-+#endif
-+
- #if defined (__SVR4) && defined (__sun)
- /* int_types.h gets included somehow, so avoid redefining the types differently */
- #include <sys/int_types.h>
Added: trunk/www/firefox-esr/files/patch-bug828003
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-esr/files/patch-bug828003 Wed Jan 9 00:34:22 2013 (r1133)
@@ -0,0 +1,36 @@
+--- gfx/qcms/qcmstypes.h
++++ gfx/qcms/qcmstypes.h
+@@ -7,30 +7,12 @@
+ #include "mozilla/StandardInteger.h"
+
+ /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
++/* stdint.h defines int*_t and uintptr_t */
+
+-#if defined (__SVR4) && defined (__sun)
+-/* int_types.h gets included somehow, so avoid redefining the types differently */
+-#include <sys/int_types.h>
+-#elif defined (_AIX)
++#if defined (_AIX)
+ #include <sys/types.h>
+-#elif defined(__OpenBSD__)
+-#include <inttypes.h>
+-#elif !defined(ANDROID)
+-typedef int8_t int8_t;
+-typedef uint8_t uint8_t;
+-typedef int16_t int16_t;
+-typedef uint16_t uint16_t;
+-typedef int32_t int32_t;
+-typedef uint32_t uint32_t;
+-typedef int64_t int64_t;
+-typedef uint64_t uint64_t;
+-
+-#ifdef __OS2__
+-/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
++#elif __OS2__
+ #include <stdlib.h>
+-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
+-typedef PRUptrdiff uintptr_t;
+-#endif
+ #endif
+
+ #else // MOZ_QCMS
Deleted: trunk/www/firefox-esr/files/patch-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/www/firefox-esr/files/patch-gfx-qcms-qcmstypes.h Wed Jan 9 00:34:22 2013 (r1132)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- gfx/qcms/qcmstypes.h~
-+++ gfx/qcms/qcmstypes.h
-@@ -8,6 +8,13 @@
-
- /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
-
-+#ifdef __FreeBSD__
-+# include <osreldate.h>
-+# if __FreeBSD_version < 900037 && defined(_INTPTR_T_DECLARED)
-+# define _UINTPTR_T_DEFINED // for old stdint.h
-+# endif
-+#endif
-+
- #if defined (__SVR4) && defined (__sun)
- /* int_types.h gets included somehow, so avoid redefining the types differently */
- #include <sys/int_types.h>
Added: trunk/www/firefox-nightly/files/patch-bug828003
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug828003 Wed Jan 9 00:34:22 2013 (r1133)
@@ -0,0 +1,36 @@
+--- gfx/qcms/qcmstypes.h
++++ gfx/qcms/qcmstypes.h
+@@ -7,30 +7,12 @@
+ #include "mozilla/StandardInteger.h"
+
+ /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
++/* stdint.h defines int*_t and uintptr_t */
+
+-#if defined (__SVR4) && defined (__sun)
+-/* int_types.h gets included somehow, so avoid redefining the types differently */
+-#include <sys/int_types.h>
+-#elif defined (_AIX)
++#if defined (_AIX)
+ #include <sys/types.h>
+-#elif defined(__OpenBSD__)
+-#include <inttypes.h>
+-#elif !defined(ANDROID)
+-typedef int8_t int8_t;
+-typedef uint8_t uint8_t;
+-typedef int16_t int16_t;
+-typedef uint16_t uint16_t;
+-typedef int32_t int32_t;
+-typedef uint32_t uint32_t;
+-typedef int64_t int64_t;
+-typedef uint64_t uint64_t;
+-
+-#ifdef __OS2__
+-/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
++#elif __OS2__
+ #include <stdlib.h>
+-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
+-typedef unsigned long uintptr_t;
+-#endif
+ #endif
+
+ #else // MOZ_QCMS
Deleted: trunk/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h Wed Jan 9 00:34:22 2013 (r1132)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- gfx/qcms/qcmstypes.h~
-+++ gfx/qcms/qcmstypes.h
-@@ -8,6 +8,13 @@
-
- /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
-
-+#ifdef __FreeBSD__
-+# include <osreldate.h>
-+# if __FreeBSD_version < 900037 && defined(_INTPTR_T_DECLARED)
-+# define _UINTPTR_T_DEFINED // for old stdint.h
-+# endif
-+#endif
-+
- #if defined (__SVR4) && defined (__sun)
- /* int_types.h gets included somehow, so avoid redefining the types differently */
- #include <sys/int_types.h>
Added: trunk/www/firefox/files/patch-bug828003
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug828003 Wed Jan 9 00:34:22 2013 (r1133)
@@ -0,0 +1,36 @@
+--- gfx/qcms/qcmstypes.h
++++ gfx/qcms/qcmstypes.h
+@@ -7,30 +7,12 @@
+ #include "mozilla/StandardInteger.h"
+
+ /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
++/* stdint.h defines int*_t and uintptr_t */
+
+-#if defined (__SVR4) && defined (__sun)
+-/* int_types.h gets included somehow, so avoid redefining the types differently */
+-#include <sys/int_types.h>
+-#elif defined (_AIX)
++#if defined (_AIX)
+ #include <sys/types.h>
+-#elif defined(__OpenBSD__)
+-#include <inttypes.h>
+-#elif !defined(ANDROID)
+-typedef int8_t int8_t;
+-typedef uint8_t uint8_t;
+-typedef int16_t int16_t;
+-typedef uint16_t uint16_t;
+-typedef int32_t int32_t;
+-typedef uint32_t uint32_t;
+-typedef int64_t int64_t;
+-typedef uint64_t uint64_t;
+-
+-#ifdef __OS2__
+-/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
++#elif __OS2__
+ #include <stdlib.h>
+-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
+-typedef unsigned long uintptr_t;
+-#endif
+ #endif
+
+ #else // MOZ_QCMS
Deleted: trunk/www/firefox/files/patch-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/www/firefox/files/patch-gfx-qcms-qcmstypes.h Wed Jan 9 00:34:22 2013 (r1132)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- gfx/qcms/qcmstypes.h~
-+++ gfx/qcms/qcmstypes.h
-@@ -8,6 +8,13 @@
-
- /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
-
-+#ifdef __FreeBSD__
-+# include <osreldate.h>
-+# if __FreeBSD_version < 900037 && defined(_INTPTR_T_DECLARED)
-+# define _UINTPTR_T_DEFINED // for old stdint.h
-+# endif
-+#endif
-+
- #if defined (__SVR4) && defined (__sun)
- /* int_types.h gets included somehow, so avoid redefining the types differently */
- #include <sys/int_types.h>
Added: trunk/www/seamonkey/files/patch-bug828003
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug828003 Wed Jan 9 00:34:22 2013 (r1133)
@@ -0,0 +1,36 @@
+--- mozilla/gfx/qcms/qcmstypes.h
++++ mozilla/gfx/qcms/qcmstypes.h
+@@ -7,30 +7,12 @@
+ #include "mozilla/StandardInteger.h"
+
+ /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
++/* stdint.h defines int*_t and uintptr_t */
+
+-#if defined (__SVR4) && defined (__sun)
+-/* int_types.h gets included somehow, so avoid redefining the types differently */
+-#include <sys/int_types.h>
+-#elif defined (_AIX)
++#if defined (_AIX)
+ #include <sys/types.h>
+-#elif defined(__OpenBSD__)
+-#include <inttypes.h>
+-#elif !defined(ANDROID)
+-typedef int8_t int8_t;
+-typedef uint8_t uint8_t;
+-typedef int16_t int16_t;
+-typedef uint16_t uint16_t;
+-typedef int32_t int32_t;
+-typedef uint32_t uint32_t;
+-typedef int64_t int64_t;
+-typedef uint64_t uint64_t;
+-
+-#ifdef __OS2__
+-/* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */
++#elif __OS2__
+ #include <stdlib.h>
+-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
+-typedef unsigned long uintptr_t;
+-#endif
+ #endif
+
+ #else // MOZ_QCMS
Deleted: trunk/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h Wed Jan 9 00:34:22 2013 (r1132)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,16 +0,0 @@
---- mozilla/gfx/qcms/qcmstypes.h~
-+++ mozilla/gfx/qcms/qcmstypes.h
-@@ -8,6 +8,13 @@
-
- /* prtypes.h defines IS_LITTLE_ENDIAN and IS_BIG ENDIAN */
-
-+#ifdef __FreeBSD__
-+# include <osreldate.h>
-+# if __FreeBSD_version < 900037 && defined(_INTPTR_T_DECLARED)
-+# define _UINTPTR_T_DEFINED // for old stdint.h
-+# endif
-+#endif
-+
- #if defined (__SVR4) && defined (__sun)
- /* int_types.h gets included somehow, so avoid redefining the types differently */
- #include <sys/int_types.h>
More information about the freebsd-gecko
mailing list