head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2;
locks; strict;
comment	@// @;


1.2
date	2012.04.28.14.12.16;	author drochner;	state dead;
branches;
next	1.1;

1.1
date	2012.04.19.21.08.04;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to 1.8.1
This is a new major branch, many fixes and enhancements.
@
text
@$NetBSD: patch-Source_WebCore_plugins_gtk_PluginViewGtk.cpp,v 1.1 2012/04/19 21:08:04 joerg Exp $

- Changeset 97591: Fix clang build

--- Source/WebCore/plugins/gtk/PluginViewGtk.cpp.orig	2012-01-31 01:20:09.000000000 +0000
+++ Source/WebCore/plugins/gtk/PluginViewGtk.cpp
@@@@ -71,6 +71,7 @@@@
 #include <gtk/gtk.h>
 
 #if defined(XP_UNIX)
+#define String XtStringType
 #include "RefPtrCairo.h"
 #include "gtk2xtbin.h"
 #define Bool int // this got undefined somewhere
@@@@ -81,6 +82,7 @@@@
 #elif defined(GDK_WINDOWING_WIN32)
 #include "PluginMessageThrottlerWin.h"
 #include <gdk/gdkwin32.h>
+#undef String
 #endif
 
 using JSC::ExecState;
@


1.1
log
@Fix build with Clang using upstream patch.
@
text
@d1 1
a1 1
$NetBSD$
@