test/headers.c: Make sure __LIBVLC__ isn't defined.

[vlc] / mozilla / vlcshell.cpp

diff --git a/mozilla/vlcshell.cpp b/mozilla/vlcshell.cpp
index 90f82880a443bc3f736b6fcf9a4a5aca52250403..3268b09bc5f656dc2456c973d13c9434129a1b82 100644 (file)
--- a/mozilla/vlcshell.cpp
+++ b/mozilla/vlcshell.cpp
@@ -30,15 +30,17 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef XP_UNIX
-#include <X11/xpm.h>
-#endif
-
 /* Mozilla stuff */
 #ifdef HAVE_MOZILLA_CONFIG_H
 #   include <mozilla-config.h>
 #endif
 
+#ifdef XP_UNIX
+#ifndef __APPLE__
+#include <X11/xpm.h>
+#endif
+#endif
+
 /* This is from mozilla java, do we really need it? */
 #if 0
 #include <jri.h>
@@ -840,21 +842,21 @@ static void Redraw( Widget w, XtPointer closure, XEvent *event )
     libvlc_media_instance_release(p_md);
 
     /* load icons */
-    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/play.xpm",
+    XpmReadFileToImage( p_display, DATA_PATH "/mozilla/play.xpm",
                         &p_playIcon, NULL, NULL);
-    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/pause.xpm",
+    XpmReadFileToImage( p_display, DATA_PATH "/mozilla/pause.xpm",
                         &p_pauseIcon, NULL, NULL);
-    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/stop.xpm",
+    XpmReadFileToImage( p_display, DATA_PATH "/mozilla/stop.xpm",
                         &p_stopIcon, NULL, NULL );
-    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/time_line.xpm",
+    XpmReadFileToImage( p_display, DATA_PATH "/mozilla/time_line.xpm",
                         &p_timeline, NULL, NULL);
-    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/time_icon.xpm",
+    XpmReadFileToImage( p_display, DATA_PATH "/mozilla/time_icon.xpm",
                         &p_timeKnob, NULL, NULL);
-    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/fullscreen.xpm",
+    XpmReadFileToImage( p_display, DATA_PATH "/mozilla/fullscreen.xpm",
                         &p_fscreen, NULL, NULL);
-    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/volume_max.xpm",
+    XpmReadFileToImage( p_display, DATA_PATH "/mozilla/volume_max.xpm",
                         &p_muteIcon, NULL, NULL);
-    XpmReadFileToImage( p_display, "/usr/share/vlc/mozilla/volume_mute.xpm",
+    XpmReadFileToImage( p_display, DATA_PATH "/mozilla/volume_mute.xpm",
                         &p_unmuteIcon, NULL, NULL);
 
 #if 1 /* DEBUG */