From: Rafaël Carré <funman@videolan.org>
Date: Wed, 6 Jun 2012 14:28:35 +0000 (-0400)
Subject: caca: X11 availability doesn't mean we use it (on OSX)
X-Git-Tag: 2.1.0-git~4136
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=3e87f5925272d7e0ee0c7bebef910934fcfcd096;p=vlc

caca: X11 availability doesn't mean we use it (on OSX)
---

diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 31cd2b825b..5e98de1034 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -88,10 +88,13 @@ static int Open(vlc_object_t *object)
     vout_display_t *vd = (vout_display_t *)object;
     vout_display_sys_t *sys;
 
-#ifndef X_DISPLAY_MISSING
+#if !defined(__APPLE__)
+# ifndef X_DISPLAY_MISSING
     if (!vlc_xlib_init(object))
         return VLC_EGENERIC;
+# endif
 #endif
+
 #if defined(WIN32) && !defined(UNDER_CE)
     CONSOLE_SCREEN_BUFFER_INFO csbiInfo;
     SMALL_RECT rect;