From fde9caa7278a429efaa482135ec35e21c2a3b9cd Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Sun, 2 Aug 2009 11:41:43 +0000 Subject: [PATCH] Include in caca_conio.h to avoid errors when this header is included after us. --- caca/caca.h | 1 - caca/caca_conio.h | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/caca/caca.h b/caca/caca.h index c0764a6..78f7887 100644 --- a/caca/caca.h +++ b/caca/caca.h @@ -28,7 +28,6 @@ #if !defined(__KERNEL__) # include -# include #endif #undef __extern diff --git a/caca/caca_conio.h b/caca/caca_conio.h index 54618d8..1aa7c26 100644 --- a/caca/caca_conio.h +++ b/caca/caca_conio.h @@ -19,6 +19,12 @@ #ifndef __CACA_CONIO_H__ #define __CACA_CONIO_H__ +/* Since we're going to redefine standard functions, include these + * headers first to avoid errors upon later inclusion. */ +#if !defined(__KERNEL__) +# include +#endif + #include #if !defined _DOXYGEN_SKIP_ME && !defined __LIBCACA__