[Gnash-commit] gnash ChangeLog plugin/klash/klash.cpp

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     06/10/15 22:06:50

Modified files:
        .              : ChangeLog 
        plugin/klash   : klash.cpp 

Log message:
        Fix compiliation issues by ensuring that `windowid' is actually defined.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1223&r2=1.1224
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/klash.cpp?cvsroot=gnash&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1223
retrieving revision 1.1224
diff -u -b -r1.1223 -r1.1224
--- ChangeLog   15 Oct 2006 20:19:42 -0000      1.1223
+++ ChangeLog   15 Oct 2006 22:06:50 -0000      1.1224
@@ -1,3 +1,8 @@
+2006-10-15 Bastiaan Jacques <address@hidden>
+
+       * plugin/klash/klash.cpp: Fix compilation issues by ensuring that
+       `windowid' is actually defined.
+
 2006-10-15 Markus Gothe <address@hidden>
 
        * backend/render_handler_agg.cpp: Added log_error on unknown 

Index: plugin/klash/klash.cpp
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/klash.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- plugin/klash/klash.cpp      15 Oct 2006 21:50:49 -0000      1.16
+++ plugin/klash/klash.cpp      15 Oct 2006 22:06:50 -0000      1.17
@@ -107,17 +107,7 @@
 int width;
 int height;
 
-#ifndef GUI_GTK
-int windowid = 0;
-#else
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-extern "C" {
-#include <gtk/gtk.h> //Do we really need this one???
-#include <gdk/gdk.h>
-}
-GdkNativeWindow windowid = 0;
-#endif
+unsigned long windowid = 0;
 
 class EmbedWidget : public QGLWidget
 {