From 383fb901108f9000a8acf4e17cbd9023da9b62ae Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 18 Sep 2006 07:20:06 +0000
Subject: [PATCH]   * Do not build the raw output in kernel mode.   * Fix
 cucul_utf32_to_cp437() call in the VGA output.

---
 caca/caca.c       | 2 ++
 caca/driver_raw.c | 5 +++--
 caca/driver_vga.c | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/caca/caca.c b/caca/caca.c
index 2802d49..b4ce635 100644
--- a/caca/caca.c
+++ b/caca/caca.c
@@ -158,7 +158,9 @@ static int caca_select_driver(caca_display_t *dp)
 #if defined(USE_GL)
         if(!strcasecmp(var, "gl")) return gl_install(dp);
 #endif
+#if !defined(__KERNEL__)
         if(!strcasecmp(var, "raw")) return raw_install(dp);
+#endif
 #if defined(USE_SLANG)
         if(!strcasecmp(var, "slang")) return slang_install(dp);
 #endif
diff --git a/caca/driver_raw.c b/caca/driver_raw.c
index 85c1851..873154e 100644
--- a/caca/driver_raw.c
+++ b/caca/driver_raw.c
@@ -19,8 +19,8 @@
 #include "common.h"
 
 #if !defined(__KERNEL__)
-#   include <stdio.h>
-#endif
+
+#include <stdio.h>
 
 #include "caca.h"
 #include "caca_internals.h"
@@ -95,3 +95,4 @@ int raw_install(caca_display_t *dp)
     return 0;
 }
 
+#endif /* !__KERNEL__ */
diff --git a/caca/driver_vga.c b/caca/driver_vga.c
index d4a2d87..788a878 100644
--- a/caca/driver_vga.c
+++ b/caca/driver_vga.c
@@ -121,7 +121,7 @@ static void vga_display(caca_display_t *dp)
 
     for(n = dp->cv->height * dp->cv->width; n--; )
     {
-        *screen++ = _cucul_utf32_to_cp437(*chars++);
+        *screen++ = cucul_utf32_to_cp437(*chars++);
         *screen++ = _cucul_argb32_to_ansi8(*attr++);
     }
 }