[Gnash-commit] /srv/bzr/gnash/trunk r11460: Fix it for __MACH__, by tracking it down to X.h

[Markus Gothe]

------------------------------------------------------------
revno: 11460
committer: Markus Gothe <address@hidden>
branch nick: trunk
timestamp: Sun 2009-08-30 21:45:19 +0200
message:
  Fix it for __MACH__, by tracking it down to X.h
modified:
  gui/gtk_glue.h
  gui/gtk_glue_gtkglext.cpp
  gui/gtk_glue_gtkglext.h

=== modified file 'gui/gtk_glue.h'
--- a/gui/gtk_glue.h    2009-08-29 17:10:26 +0000
+++ b/gui/gtk_glue.h    2009-08-30 19:45:19 +0000
@@ -21,7 +21,7 @@
 #include "gnash.h"
 
 #include <gtk/gtk.h>
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__MACH__)
 #include <gdk/gdkx.h>
 #else
 #include <gdk/gdk.h>

=== modified file 'gui/gtk_glue_gtkglext.cpp'
--- a/gui/gtk_glue_gtkglext.cpp 2009-07-20 17:31:35 +0000
+++ b/gui/gtk_glue_gtkglext.cpp 2009-08-30 19:45:19 +0000
@@ -19,7 +19,6 @@
 
 
 #include "gtk_glue_gtkglext.h"
-#include "Renderer_ogl.h"
 #include "log.h"
 
 using namespace std;

=== modified file 'gui/gtk_glue_gtkglext.h'
--- a/gui/gtk_glue_gtkglext.h   2009-08-29 17:10:26 +0000
+++ b/gui/gtk_glue_gtkglext.h   2009-08-30 19:45:19 +0000
@@ -18,6 +18,7 @@
 #ifndef GTK_GLU_GTKGLEXT_H
 #define GTK_GLU_GTKGLEXT_H
 
+#include "Renderer_ogl.h"
 #include "gtk_glue.h"
 
 #include <gtk/gtkgl.h>