# HG changeset patch
# User nenolod
# Date 1157675129 25200
# Node ID 6e477dd650241f128ec8ca81248a2de9aeb436bf
# Parent  3299a2225fa6d4e9417421e623cab5c2bdc397da
[svn] - gtkquartz compatibility, pass 1

diff -r 3299a2225fa6 -r 6e477dd65024 ChangeLog
--- a/ChangeLog	Thu Sep 07 11:57:03 2006 -0700
+++ b/ChangeLog	Thu Sep 07 17:25:29 2006 -0700
@@ -1,3 +1,12 @@
+2006-09-07 18:57:03 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [2209]
+  - use #ifdef linux instead
+  
+
+  Changes:        Modified:
+  +1 -1           trunk/Plugins/Input/wma/libffwma/mem.c  
+
+
 2006-09-07 18:45:48 +0000  William Pitcock <nenolod@nenolod.net>
   revision [2207]
   - wma.c: use av_malloc() instead of directly using posix_memalign()
diff -r 3299a2225fa6 -r 6e477dd65024 audacious/about.c
--- a/audacious/about.c	Thu Sep 07 11:57:03 2006 -0700
+++ b/audacious/about.c	Thu Sep 07 17:25:29 2006 -0700
@@ -26,11 +26,10 @@
 
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+#include "platform/smartinclude.h"
+
 static GtkWidget *about_window = NULL;
 static GdkPixbuf *about_pixbuf = NULL;
 static GdkPixmap *mask_pixmap_window1 = NULL,
diff -r 3299a2225fa6 -r 6e477dd65024 audacious/dock.c
--- a/audacious/dock.c	Thu Sep 07 11:57:03 2006 -0700
+++ b/audacious/dock.c	Thu Sep 07 17:25:29 2006 -0700
@@ -25,8 +25,7 @@
 #include <stdlib.h>
 #include "main.h"
 
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
+#include "platform/smartinclude.h"
 
 struct _DockedWindow {
     GtkWindow *w;
diff -r 3299a2225fa6 -r 6e477dd65024 audacious/equalizer.c
--- a/audacious/equalizer.c	Thu Sep 07 11:57:03 2006 -0700
+++ b/audacious/equalizer.c	Thu Sep 07 17:25:29 2006 -0700
@@ -31,15 +31,11 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
 #include <stdio.h>
 #include <math.h>
 #include <string.h>
 
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
-
+#include "platform/smartinclude.h"
 #include "widgets/widgetcore.h"
 #include "dock.h"
 #include "hints.h"
diff -r 3299a2225fa6 -r 6e477dd65024 audacious/genevent.c
--- a/audacious/genevent.c	Thu Sep 07 11:57:03 2006 -0700
+++ b/audacious/genevent.c	Thu Sep 07 17:25:29 2006 -0700
@@ -43,9 +43,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
 
 #include "libaudacious/configdb.h"
 #include "libaudacious/beepctrl.h"
diff -r 3299a2225fa6 -r 6e477dd65024 audacious/hints.c
--- a/audacious/hints.c	Thu Sep 07 11:57:03 2006 -0700
+++ b/audacious/hints.c	Thu Sep 07 17:25:29 2006 -0700
@@ -31,8 +31,7 @@
 #include "mainwin.h"
 #include "ui_playlist.h"
 
-#include <gdk/gdkx.h>
-#include <gdk/gdkprivate.h>
+#include "platform/smartinclude.h"
 
 void
 hint_set_always(gboolean always)
diff -r 3299a2225fa6 -r 6e477dd65024 audacious/main.c
--- a/audacious/main.c	Thu Sep 07 11:57:03 2006 -0700
+++ b/audacious/main.c	Thu Sep 07 17:25:29 2006 -0700
@@ -43,9 +43,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
-#include <gdk/gdkx.h>
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
+
+#include "platform/smartinclude.h"
 
 #include "libaudacious/configdb.h"
 #include "libaudacious/beepctrl.h"
diff -r 3299a2225fa6 -r 6e477dd65024 audacious/mainwin.c
--- a/audacious/mainwin.c	Thu Sep 07 11:57:03 2006 -0700
+++ b/audacious/mainwin.c	Thu Sep 07 17:25:29 2006 -0700
@@ -32,8 +32,9 @@
 #include <glib/gprintf.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkmessagedialog.h>
-#include <gdk/gdkx.h>
-#include <gdk/gdkkeysyms.h>
+
+/* GDK including */
+#include "platform/smartinclude.h"
 
 #include <math.h>
 #include <stdlib.h>
diff -r 3299a2225fa6 -r 6e477dd65024 audacious/platform/smartinclude.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/audacious/platform/smartinclude.h	Thu Sep 07 17:25:29 2006 -0700
@@ -0,0 +1,35 @@
+/*
+ *  Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include <gdk/gdk.h>
+
+#ifdef GDK_WINDOWING_X11
+
+# include <gdk/gdkx.h>
+# include <X11/Xlib.h>
+# include <X11/Xatom.h>
+
+#endif
+
+#ifdef GDK_WINDOWING_WIN32
+
+# include <gdk/gdkwin32.h>
+
+#endif
+
+#include <gdk/gdkkeysyms.h>
diff -r 3299a2225fa6 -r 6e477dd65024 audacious/skinwin.c
--- a/audacious/skinwin.c	Thu Sep 07 11:57:03 2006 -0700
+++ b/audacious/skinwin.c	Thu Sep 07 17:25:29 2006 -0700
@@ -28,8 +28,9 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkkeysyms.h>
+
+#include "platform/smartinclude.h"
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -37,8 +38,6 @@
 #include "widgets/widgetcore.h"
 #include "util.h"
 
-#include <gdk/gdkx.h>
-
 #define EXTENSION_TARGETS 7
 
 static gchar *ext_targets[EXTENSION_TARGETS] = { "bmp", "xpm", "png", "svg",
diff -r 3299a2225fa6 -r 6e477dd65024 audacious/ui_playlist.c
--- a/audacious/ui_playlist.c	Thu Sep 07 11:57:03 2006 -0700
+++ b/audacious/ui_playlist.c	Thu Sep 07 17:25:29 2006 -0700
@@ -31,9 +31,8 @@
 #include <gtk/gtk.h>
 #include <string.h>
 
-#include <gdk/gdkx.h>
+#include "platform/smartinclude.h"
 
-#include <X11/Xlib.h>
 #include <unistd.h>
 #include <errno.h>
 
diff -r 3299a2225fa6 -r 6e477dd65024 audacious/util.c
--- a/audacious/util.c	Thu Sep 07 11:57:03 2006 -0700
+++ b/audacious/util.c	Thu Sep 07 17:25:29 2006 -0700
@@ -32,13 +32,12 @@
 #include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <gtk/gtk.h>
-#include <gdk/gdk.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
-#include <gdk/gdkx.h>
+#include "platform/smartinclude.h"
 #include <gdk/gdkkeysyms.h>
 #include <X11/Xlib.h>
 //#include <sys/ipc.h>
diff -r 3299a2225fa6 -r 6e477dd65024 audacious/widgets/skin.c
--- a/audacious/widgets/skin.c	Thu Sep 07 11:57:03 2006 -0700
+++ b/audacious/widgets/skin.c	Thu Sep 07 17:25:29 2006 -0700
@@ -41,9 +41,13 @@
 
 #include "debug.h"
 
+#if defined(GDK_WINDOWING_X11)
+
 #include <gdk/gdkx.h>
 #include <X11/Xlib.h>
 
+#endif
+
 #define EXTENSION_TARGETS 7
 
 static gchar *ext_targets[EXTENSION_TARGETS] = { "bmp", "xpm", "png", "svg", 
@@ -431,6 +435,7 @@
 static void
 skin_query_color(GdkColormap * cm, GdkColor * c)
 {
+#ifdef GDK_WINDOWING_X11
     XColor xc = { 0,0,0,0,0,0 };
 
     xc.pixel = c->pixel;
@@ -438,6 +443,9 @@
     c->red = xc.red;
     c->green = xc.green;
     c->blue = xc.blue;
+#else
+    /* do nothing. see what breaks? */
+#endif
 }
 
 static glong