Author: jbeich Date: Sat Sep 22 21:53:54 2012 New Revision: 1028 Log: fix patch conflict after bug 785321 landed
Reported by: AN <[email protected]> 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 _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
