From owner-freebsd-gecko@FreeBSD.ORG Mon Dec 3 18:03:29 2012 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AC968E0C for ; Mon, 3 Dec 2012 18:03:29 +0000 (UTC) (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.245.56]) by mx1.freebsd.org (Postfix) with ESMTP id 476028FC13 for ; Mon, 3 Dec 2012 18:03:29 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.245.56]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id qB3I3STY094557 for ; Mon, 3 Dec 2012 18:03:28 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id qB3I3NJU093029 for freebsd-gecko@freebsd.org; Mon, 3 Dec 2012 18:03:23 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Mon, 3 Dec 2012 18:03:23 GMT Message-Id: <201212031803.qB3I3NJU093029@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [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 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2012 18:03:29 -0000 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 --#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 ++# 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 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 --#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 ++# 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 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 --#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 ++# 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 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 --#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 ++# 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 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 --#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 ++# 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 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 --#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 ++# 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