From owner-freebsd-gecko@FreeBSD.ORG  Sat Sep 22 21:54:07 2012
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7A330106564A
	for <freebsd-gecko@freebsd.org>; Sat, 22 Sep 2012 21:54:07 +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 019AE8FC12
	for <freebsd-gecko@freebsd.org>; Sat, 22 Sep 2012 21:54:06 +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 q8MLs0Gq044873
	for <freebsd-gecko@freebsd.org>; Sat, 22 Sep 2012 21:54:00 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q8MLrtVl044261
	for freebsd-gecko@freebsd.org; Sat, 22 Sep 2012 21:53:55 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Sat, 22 Sep 2012 21:53:55 GMT
Message-Id: <201209222153.q8MLrtVl044261@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
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r1028 - trunk/www/firefox-nightly/files
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 22 Sep 2012 21:54:07 -0000

Author: jbeich
Date: Sat Sep 22 21:53:54 2012
New Revision: 1028

Log:
fix patch conflict after bug 785321 landed

Reported by:	AN <andy@neu.net>

Modified:
   trunk/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h

Modified: trunk/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h
==============================================================================
--- trunk/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h	Sat Sep 22 10:47:03 2012	(r1027)
+++ trunk/www/firefox-nightly/files/patch-gfx-qcms-qcmstypes.h	Sat Sep 22 21:53:54 2012	(r1028)
@@ -6,6 +6,6 @@
  #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;
+ typedef unsigned long uintptr_t;
  #endif
  #endif