[SVN-Commit] r1112 - 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
Mon Dec 3 18:03:29 UTC 2012
Author: jbeich
Date: Mon Dec 3 18:03:23 2012
New Revision: 1112
Log:
try a different workaround for uintptr_t
Modified:
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
Modified: trunk/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h Mon Dec 3 18:03:12 2012 (r1111)
+++ trunk/mail/thunderbird-esr/files/patch-mozilla-gfx-qcms-qcmstypes.h Mon Dec 3 18:03:23 2012 (r1112)
@@ -1,11 +1,16 @@
---- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100
-+++ mozilla/gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100
-@@ -25,7 +25,7 @@
- #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(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
-+#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED)
- typedef PRUptrdiff uintptr_t;
- #endif
- #endif
+--- 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>
Modified: trunk/mail/thunderbird/files/patch-mozilla-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/mail/thunderbird/files/patch-mozilla-gfx-qcms-qcmstypes.h Mon Dec 3 18:03:12 2012 (r1111)
+++ trunk/mail/thunderbird/files/patch-mozilla-gfx-qcms-qcmstypes.h Mon Dec 3 18:03:23 2012 (r1112)
@@ -1,11 +1,16 @@
---- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100
-+++ mozilla/gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100
-@@ -25,7 +25,7 @@
- #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(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
-+#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED)
- typedef unsigned long uintptr_t;
- #endif
- #endif
+--- 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>
Modified: trunk/www/firefox-esr/files/patch-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/www/firefox-esr/files/patch-gfx-qcms-qcmstypes.h Mon Dec 3 18:03:12 2012 (r1111)
+++ trunk/www/firefox-esr/files/patch-gfx-qcms-qcmstypes.h Mon Dec 3 18:03:23 2012 (r1112)
@@ -1,11 +1,16 @@
---- gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100
-+++ gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100
-@@ -25,7 +25,7 @@
- #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(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
-+#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED)
- typedef PRUptrdiff uintptr_t;
- #endif
- #endif
+--- 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>
Modified: trunk/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h Mon Dec 3 18:03:12 2012 (r1111)
+++ trunk/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h Mon Dec 3 18:03:23 2012 (r1112)
@@ -1,11 +1,16 @@
---- gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100
-+++ gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100
-@@ -25,7 +25,7 @@
- #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(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
-+#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED)
- typedef unsigned long uintptr_t;
- #endif
- #endif
+--- 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>
Modified: trunk/www/firefox/files/patch-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/www/firefox/files/patch-gfx-qcms-qcmstypes.h Mon Dec 3 18:03:12 2012 (r1111)
+++ trunk/www/firefox/files/patch-gfx-qcms-qcmstypes.h Mon Dec 3 18:03:23 2012 (r1112)
@@ -1,11 +1,16 @@
---- gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100
-+++ gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100
-@@ -25,7 +25,7 @@
- #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(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
-+#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED)
- typedef unsigned long uintptr_t;
- #endif
- #endif
+--- 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>
Modified: trunk/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h Mon Dec 3 18:03:12 2012 (r1111)
+++ trunk/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h Mon Dec 3 18:03:23 2012 (r1112)
@@ -1,11 +1,16 @@
---- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100
-+++ mozilla/gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100
-@@ -25,7 +25,7 @@
- #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(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED)
-+#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED)
- typedef unsigned long uintptr_t;
- #endif
- #endif
+--- 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