Attachment #319270 for bug #428130

View | Details | Raw Unified | Return to bug 428130
Collapse All | Expand All

Lines 71-76 Link Here

(-)webkit-1.6.3/Source/WebCore/plugins/gtk/PluginViewGtk.cpp~ (+2 lines)
71	#include <gtk/gtk.h>	71	#include <gtk/gtk.h>
72		72
73	#if defined(XP_UNIX)	73	#if defined(XP_UNIX)
		74	#define String XtStringType
74	#include "RefPtrCairo.h"	75	#include "RefPtrCairo.h"
75	#include "gtk2xtbin.h"	76	#include "gtk2xtbin.h"
76	#define Bool int // this got undefined somewhere	77	#define Bool int // this got undefined somewhere
Lines 81-86 Link Here
81	#elif defined(GDK_WINDOWING_WIN32)	82	#elif defined(GDK_WINDOWING_WIN32)
82	#include "PluginMessageThrottlerWin.h"	83	#include "PluginMessageThrottlerWin.h"
83	#include <gdk/gdkwin32.h>	84	#include <gdk/gdkwin32.h>
		85	#undef String
84	#endif	86	#endif
85		87
86	using JSC::ExecState;	88	using JSC::ExecState;

Lines 28-34 Link Here

(-)webkit-1.6.3/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.cpp~ (-1 / +1 lines)
28	#include "PluginObject.h"	28	#include "PluginObject.h"
29	#include <assert.h>	29	#include <assert.h>
30	#include <string.h>	30	#include <string.h>
31		31	#include <unistd.h>
32	using namespace std;	32	using namespace std;
33	extern NPNetscapeFuncs *browser;	33	extern NPNetscapeFuncs *browser;
34		34

Return to bug 428130