Merge branch 'master' into release

2 files changed, 11 insertions, 2 deletions

diff --git a/widget/GfxInfoX11.cpp b/widget/GfxInfoX11.cpp
index 338dcac67..05a2cab1a 100644
--- a/widget/GfxInfoX11.cpp
+++ b/widget/GfxInfoX11.cpp
@@ -187,6 +187,15 @@ GfxInfo::GetData()
         note.AppendLiteral(" -- texture_from_pixmap");
     note.Append('\n');
 
+    // illumos/Solaris 10 libc lacks a strcasestr function, but NSPR has 
+    // one. A lot of programs just implement one on the spot or use strstr 
+    // and a buffer as some kind of workaround. They've been implementing
+    // missing functions lately, though, so this may not be needed much longer.
+
+#ifndef strcasestr
+#define strcasestr PL_strcasestr
+#endif    
+
     // determine the major OpenGL version. That's the first integer in the version string.
     mGLMajorVersion = strtol(mVersion.get(), 0, 10);
 
diff --git a/widget/gtk/nsClipboard.cpp b/widget/gtk/nsClipboard.cpp
index eecae3e88..950be1dc4 100644
--- a/widget/gtk/nsClipboard.cpp
+++ b/widget/gtk/nsClipboard.cpp
@@ -806,7 +806,7 @@ void GetHTMLCharset(guchar * data, int32_t dataLength, nsCString& str)
 static void
 DispatchSelectionNotifyEvent(GtkWidget *widget, XEvent *xevent)
 {
-    GdkEvent event;
+    GdkEvent event = {};
     event.selection.type = GDK_SELECTION_NOTIFY;
     event.selection.window = gtk_widget_get_window(widget);
     event.selection.selection = gdk_x11_xatom_to_atom(xevent->xselection.selection);
@@ -822,7 +822,7 @@ DispatchPropertyNotifyEvent(GtkWidget *widget, XEvent *xevent)
 {
     GdkWindow *window = gtk_widget_get_window(widget);
     if ((gdk_window_get_events(window)) & GDK_PROPERTY_CHANGE_MASK) {
-        GdkEvent event;
+        GdkEvent event = {};
         event.property.type = GDK_PROPERTY_NOTIFY;
         event.property.window = window;
         event.property.atom = gdk_x11_xatom_to_atom(xevent->xproperty.atom);