* Remove #include <stdint.h> etc. from "common.h". Instead, make sure that

<cucul.h> will provide the C99 types, even if libcaca has been installed.
  * Rename what's left of "common.h" to "stubs.h".
  * Remove all references to erroneous <inttypes.h> from source files.

Makefile.am

@@ -3,7 +3,7 @@
 SUBDIRS = kernel cucul caca src examples tests tools csharp cxx python ruby doc
 DIST_SUBDIRS = $(SUBDIRS) msvc
 
-EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in common.h libcaca.spec
+EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in stubs.h libcaca.spec
 AUTOMAKE_OPTIONS = dist-bzip2
 
 bin_SCRIPTS = caca-config

build-dos

@@ -18,7 +18,7 @@ mkdir "${BUILDDIR}"
 
 cd "${BUILDDIR}"
 # Build for DOS
-"${SRCDIR}/configure" --host=i386-pc-msdosdjgpp --prefix=/ --bindir=/ --libdir=/ --disable-imlib2 --disable-doc
+"${SRCDIR}/configure" --host=i386-pc-msdosdjgpp --prefix=/ --bindir=/ --libdir=/ --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx
 make pkglibdir=/lib pkgdatadir=/data
 # Install into our private directory
 make install DESTDIR="${INSTALLDIR}" pkglibdir=/lib pkgdatadir=/
@@ -28,7 +28,7 @@ rm -Rf "${BUILDDIR}"
 i386-pc-msdosdjgpp-strip "${INSTALLDIR}/"*.exe
 
 mkdir "${INSTALLDIR}/doc"
-for f in COPYING COPYING.LGPL COPYING.GPL README AUTHORS NEWS NOTES THANKS TODO; do
+for f in COPYING COPYING.LGPL COPYING.GPL README AUTHORS NEWS NOTES THANKS; do
    sed -e 's/$/^M/' < "${SRCDIR}/${f}" > "${INSTALLDIR}/doc/${f}.txt"
 done
 

build-kernel

@@ -6,7 +6,7 @@
 set -x
 set -e
 
-CFLAGS="-fno-builtin -O2 -I. -I.. -Wall"
+CFLAGS="-fno-builtin -O2 -I. -I.. -I../cucul/ -Wall"
 CPPFLAGS="-D__KERNEL__ -nostdinc -include kernel/kernel.h"
 LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000"
 

build-win32

@@ -34,7 +34,7 @@ rmdir "${INSTALLDIR}/bin"
 rmdir "${INSTALLDIR}/lib"
 
 mkdir "${INSTALLDIR}/doc"
-for f in COPYING COPYING.LGPL COPYING.GPL README AUTHORS NEWS NOTES THANKS TODO; do
+for f in COPYING COPYING.LGPL COPYING.GPL README AUTHORS NEWS NOTES THANKS; do
    sed -e 's/$/
/' < "${SRCDIR}/${f}" > "${INSTALLDIR}/doc/${f}.txt"
 done
 rm -Rf "${INSTALLDIR}/share"

caca/Makefile.am

@@ -3,7 +3,8 @@
 EXTRA_DIST = caca.pc.in
 DISTCLEANFILES = caca.pc
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -DPLUGINDIR=\"$(plugindir)\"
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
+              -DPLUGINDIR=\"$(plugindir)\"
 
 pkgconfig_DATA = caca.pc
 pkgconfigdir = $(libdir)/pkgconfig

caca/caca.c

@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdlib.h>

caca/caca0.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdlib.h>

caca/caca_internals.h

@@ -15,9 +15,7 @@
 #ifndef __CACA_INTERNALS_H__
 #define __CACA_INTERNALS_H__
 
-#if defined(HAVE_INTTYPES_H) && !defined(__KERNEL__)
-#   include <inttypes.h>
-#endif
+#include "stubs.h"
 
 typedef struct caca_timer caca_timer_t;
 typedef struct caca_privevent caca_privevent_t;

caca/driver_conio.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if defined(USE_CONIO)
 

caca/driver_gl.c

@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if defined(USE_GL)
 

caca/driver_ncurses.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if defined USE_NCURSES
 

caca/driver_raw.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 

caca/driver_slang.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if defined(USE_SLANG)
 

caca/driver_vga.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if defined(USE_VGA)
 

caca/driver_win32.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if defined(USE_WIN32)
 

caca/driver_x11.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if defined(USE_X11)
 

caca/event.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

caca/graphics.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

caca/time.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdlib.h>

configure.ac

@@ -87,7 +87,7 @@ AC_ARG_ENABLE(doc,
 AC_ARG_ENABLE(zzuf,
   [  --enable-zzuf           use zzuf for fuzzing tests (autodetected)])
 
-AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h inttypes.h endian.h unistd.h arpa/inet.h netinet/in.h winsock2.h errno.h locale.h getopt.h dlfcn.h termios.h)
+AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h endian.h unistd.h arpa/inet.h netinet/in.h winsock2.h errno.h locale.h getopt.h dlfcn.h termios.h)
 AC_CHECK_FUNCS(signal ioctl snprintf vsnprintf getenv putenv strcasecmp htons)
 AC_CHECK_FUNCS(usleep gettimeofday)
 
@@ -323,6 +323,19 @@ AC_SUBST(CACA_LIBS)
 AC_SUBST(X11_LIBS)
 AC_SUBST(GL_LIBS)
 
+# How to get the C99 types. See cucul/cucul_types.h.in for details about
+# the CUCUL_TYPES variable
+if test "${ac_cv_my_have_vga}" = "yes"; then
+  CUCUL_TYPES=0
+else
+  AC_CHECK_HEADERS(stdint.h,
+    [CUCUL_TYPES=1],
+    [AC_CHECK_HEADERS(inttypes.h,
+      [CUCUL_TYPES=2],
+      [CUCUL_TYPES=0])])
+fi
+AC_SUBST(CUCUL_TYPES)
+
 # Optimizations
 CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
 # Code qui fait des warnings == code de porc == deux baffes dans ta gueule
@@ -462,6 +475,7 @@ AC_CONFIG_FILES([
   msvc/Makefile
 ])
 AC_CONFIG_FILES([
+  cucul/cucul_types.h
   cucul/cucul.pc
   caca/caca.pc
   csharp/cucul-sharp.dll.config

cucul/.gitignore

@@ -0,0 +1 @@
+cucul_types.h

cucul/Makefile.am

@@ -1,18 +1,19 @@
 # $Id$
 
-EXTRA_DIST = cucul.pc.in mono9.data monobold12.data
-DISTCLEANFILES = cucul.pc
+EXTRA_DIST = cucul_types.h.in cucul.pc.in mono9.data monobold12.data
+DISTCLEANFILES = cucul_types.h cucul.pc
 
 pkgconfig_DATA = cucul.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
-include_HEADERS = cucul.h
+include_HEADERS = cucul.h cucul_types.h
 
 lib_LTLIBRARIES = libcucul.la
 
 libcucul_la_SOURCES = \
 	cucul.c \
 	cucul.h \
+	cucul_types.h \
 	cucul_internals.h \
 	legacy.c \
 	canvas.c \
@@ -35,7 +36,7 @@ libcucul_la_DEPENDENCIES = \
 	mono9.data \
 	monobold12.data \
 	$(NULL)
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul
 libcucul_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
 libcucul_la_LIBADD = $(ZLIB_LIBS)
 

cucul/attr.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #include "cucul.h"
 #include "cucul_internals.h"

cucul/box.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdlib.h>

cucul/canvas.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h> /* BUFSIZ */

cucul/charset.c

@@ -19,7 +19,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <string.h>

cucul/conic.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdlib.h>

cucul/cucul.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

cucul/cucul.h

@@ -24,6 +24,8 @@
 #ifndef __CUCUL_H__
 #define __CUCUL_H__
 
+#include <cucul_types.h>
+
 #undef __extern
 #if defined(_WIN32) && defined(__LIBCUCUL__)
 #   define __extern extern __declspec(dllexport)

cucul/cucul_internals.h

@@ -15,9 +15,7 @@
 #ifndef __CUCUL_INTERNALS_H__
 #define __CUCUL_INTERNALS_H__
 
-#if defined(HAVE_INTTYPES_H) && !defined(__KERNEL__)
-#   include <inttypes.h>
-#endif
+#include "stubs.h"
 
 typedef struct cucul_figfont cucul_figfont_t;
 

cucul/cucul_types.h.in

@@ -0,0 +1,51 @@
+/*
+ *  libcucul      Canvas for ultrafast compositing of Unicode letters
+ *  libcaca       Colour ASCII-Art library
+ *  Copyright (c) 2008 Sam Hocevar <sam@zoy.org>
+ *                All Rights Reserved
+ *
+ *  $Id$
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the Do What The Fuck You Want To
+ *  Public License, Version 2, as published by Sam Hocevar. See
+ *  http://sam.zoy.org/wtfpl/COPYING for more details.
+ */
+
+/*
+ *  This file contains definitions for the C99 integer types.
+ */
+
+#ifndef __CUCUL_TYPES_H__
+#define __CUCUL_TYPES_H__
+
+#ifndef CUCUL_TYPES
+#   define CUCUL_TYPES @CUCUL_TYPES@
+#endif
+
+/* mode 1: standard <inttypes.h> header is present, just include it */
+#if CUCUL_TYPES == 1
+#   include <inttypes.h>
+
+/* mode 2: standard <stdint.h> header is present, just include it */
+#elif CUCUL_TYPES == 2
+#   include <stdint.h>
+
+/* fallback: nothing is available, we assume the platform is 32-bit and
+ * sizeof(long) == sizeof(void *) */
+#else
+typedef signed char int8_t;
+typedef signed short int16_t;
+typedef signed long int int32_t;
+
+typedef unsigned char uint8_t;
+typedef unsigned short uint16_t;
+typedef unsigned long int uint32_t;
+
+typedef long int intptr_t;
+typedef unsigned long int uintptr_t;
+
+#endif
+
+#endif /* __CUCUL_TYPES_H__ */
+

cucul/dither.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   if defined(HAVE_ENDIAN_H)

cucul/export.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdlib.h>

cucul/figfont.c

@@ -21,7 +21,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

cucul/file.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined __KERNEL__
 #   include <stdio.h>

cucul/font.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   if defined(HAVE_ENDIAN_H)

cucul/frame.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

cucul/import.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined __KERNEL__
 #   include <stdio.h>

cucul/legacy.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

cucul/line.c

@@ -18,7 +18,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdlib.h>

cucul/transform.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdlib.h>

cucul/triangle.c

@@ -17,7 +17,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdlib.h>

cxx/Makefile.am

@@ -1,6 +1,7 @@
 # $Id: Makefile.am 552 2006-04-13 16:10:16Z jylam $
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
+              -I$(top_srcdir)/caca
 
 if USE_CXX
 include_HEADERS = cucul++.h caca++.h

examples/Makefile.am

@@ -1,6 +1,7 @@
 # $Id$
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
+              -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
 
 noinst_PROGRAMS = blit colors cucul demo demo0 dithering driver event export figfont font font2tga frames fullwidth gamma hsv input spritedit swallow text transform truecolor unicode import
 

examples/blit.c

@@ -13,7 +13,7 @@
  */
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
 #   include <stdio.h>
 #   include <string.h>

examples/colors.c

@@ -13,7 +13,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

examples/cucul.c

@@ -13,7 +13,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

examples/demo.c

@@ -13,12 +13,14 @@
  */
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
 #   include <math.h>
 #   include <string.h>
 #   include <stdio.h>
 #endif
+
+#include "cucul.h"
 #include "caca.h"
 
 static void display_menu(void);

examples/dithering.c

@@ -13,7 +13,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

examples/driver.c

@@ -13,7 +13,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <string.h>

examples/event.c

@@ -13,7 +13,7 @@
  */
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
 #   include <stdio.h>
 #   include <string.h>

examples/export.c

@@ -13,12 +13,8 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <stdlib.h>
 #   include <string.h>

examples/figfont.c

@@ -13,7 +13,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

examples/font.c

@@ -13,13 +13,8 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
-
 #   if defined(HAVE_ENDIAN_H)
 #      include <endian.h>
 #   endif

examples/font2tga.c

@@ -13,12 +13,8 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <stdlib.h>
 #endif

examples/frames.c

@@ -13,14 +13,11 @@
  */
 
 #include "config.h"
-#include "common.h"
-#if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 
+#if !defined(__KERNEL__)
 #   include <stdio.h>
 #endif
+
 #include "cucul.h"
 #include "caca.h"
 

examples/fullwidth.c

@@ -13,12 +13,8 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #endif
 

examples/gamma.c

@@ -13,12 +13,8 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <math.h>
 #endif

examples/hsv.c

@@ -13,12 +13,8 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #endif
 

examples/import.c

@@ -13,18 +13,12 @@
  */
 
 #include "config.h"
-#include "common.h"
-
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <stdlib.h>
 #endif
 
-
 #include "cucul.h"
 #include "caca.h"
 

examples/input.c

@@ -13,12 +13,8 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#       include <inttypes.h>
-#   endif
 #   include <string.h>
 #   include <stdio.h>
 #endif

examples/spritedit.c

@@ -13,7 +13,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

examples/swallow.c

@@ -13,7 +13,7 @@
  */
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
 #   include <stdio.h>
 #   include <string.h>

examples/text.c

@@ -13,15 +13,13 @@
  */
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <string.h>
 #   include <stdlib.h>
 #endif
+
 #include "cucul.h"
 
 #define STRING \

examples/transform.c

@@ -13,11 +13,8 @@
  */
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <string.h>
 #endif

examples/truecolor.c

@@ -13,12 +13,8 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #endif
 

examples/unicode.c

@@ -13,12 +13,8 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #endif
 

kernel/kernel.c

@@ -20,7 +20,8 @@
  */
 
 #include "config.h"
-#include "common.h"
+
+#include "cucul_types.h"
 
 #ifdef __KERNEL__
 

msvc/Makefile.am

@@ -4,7 +4,7 @@ NULL =
 
 EXTRA_DIST = libcaca.sln \
              config.h \
-             common.h \
+             cucul_types.h \
              libcucul.vcproj \
              libcaca.vcproj \
              cacafire.vcproj \

msvc/common.h

@@ -1 +0,0 @@
-#include "../common.h"

msvc/cucul_types.h

@@ -0,0 +1,2 @@
+#define CUCUL_TYPES 0
+#include "../cucul/cucul_types.h.in"

ruby/Makefile.am

@@ -11,7 +11,7 @@ endif
 
 CFLAGS += -Wno-strict-prototypes -Wno-missing-prototypes
 
-cucul_la_CPPFLAGS = -I$(top_srcdir)/cucul $(RUBY_CFLAGS)
+cucul_la_CPPFLAGS = -I$(top_srcdir)/cucul -I../cucul $(RUBY_CFLAGS)
 cucul_la_SOURCES = cucul.c \
                    common.h \
                    cucul-canvas.c \
@@ -24,7 +24,8 @@ cucul_la_SOURCES = cucul.c \
 cucul_la_LDFLAGS = -module -avoid-version -shared $(RUBY_LIBS)
 cucul_la_LIBADD = ../cucul/libcucul.la
 
-caca_la_CPPFLAGS = -I$(top_srcdir)/caca -I$(top_srcdir)/cucul $(RUBY_CFLAGS)
+caca_la_CPPFLAGS = -I$(top_srcdir)/caca -I$(top_srcdir)/cucul -I../cucul \
+                   $(RUBY_CFLAGS)
 caca_la_SOURCES = caca.c \
                   common.h \
                   caca-display.c \

src/Makefile.am

@@ -3,7 +3,8 @@
 pkgdata_DATA = caca.txt
 
 EXTRA_DIST = caca.txt
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DLIBCACA=1 -DX_DISPLAY_MISSING=1
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
+              -I$(top_srcdir)/caca -DLIBCACA=1 -DX_DISPLAY_MISSING=1
 
 bin_PROGRAMS = cacademo cacafire cacaplay cacaview img2txt $(fcntl_programs)
 noinst_PROGRAMS = cacadraw

src/aafire.c

@@ -24,12 +24,12 @@
 
 #ifdef LIBCACA
 #include "config.h"
-#include "common.h"
 #if !defined(__KERNEL__)
 #   include <stdio.h>
 #   include <stdlib.h>
 #   include <string.h>
 #endif
+#include "cucul.h"
 #include "caca.h"
 #else
 #include <stdio.h>

src/cacademo.c

@@ -15,7 +15,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

src/cacadraw.c

@@ -13,7 +13,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

src/cacaplay.c

@@ -13,7 +13,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

src/cacaserver.c

@@ -14,7 +14,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>
 #include <string.h>

src/cacaview.c

@@ -13,7 +13,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>
@@ -27,6 +26,7 @@
 
 #include "cucul.h"
 #include "caca.h"
+
 #include "common-image.h"
 
 /* Local macros */

src/common-image.c

@@ -13,7 +13,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>
@@ -30,6 +29,7 @@
 #endif
 
 #include "cucul.h"
+
 #include "common-image.h"
 
 #if !defined(USE_IMLIB2)

src/img2txt.c

@@ -14,7 +14,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>
@@ -35,6 +34,7 @@
 #endif
 
 #include "cucul.h"
+
 #include "common-image.h"
 
 #define IMG2TXTVERSION "0.1"

src/mygetopt.c

@@ -17,17 +17,12 @@
  */
 
 #include "config.h"
-#include "common.h"
-
-#if defined HAVE_STDINT_H
-#   include <stdint.h>
-#elif defined HAVE_INTTYPES_H
-#   include <inttypes.h>
-#endif
 
 #include <stdio.h>
 #include <string.h>
 
+#include "cucul_types.h"
+
 #include "mygetopt.h"
 
 int   myoptind = 1;

common.h → stubs.h

@@ -17,21 +17,8 @@
  *  function prototypes that are sometimes missing.
  */
 
-/* C99 types */
-#if defined HAVE_INTTYPES_H && !defined __KERNEL__
-#   include <inttypes.h>
-#else
-typedef signed char int8_t;
-typedef signed short int16_t;
-typedef signed long int int32_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned long int uint32_t;
-
-typedef long int intptr_t;
-typedef unsigned long int uintptr_t;
-#endif
+#ifndef __STUBS_H__
+#define __STUBS_H__
 
 /* errno handling */
 #if defined HAVE_ERRNO_H && !defined __KERNEL__
@@ -107,3 +94,5 @@ static inline uint32_t hton32(uint32_t x)
 }
 #endif
 
+#endif /* __STUBS_H__ */
+

tests/Makefile.am

@@ -1,6 +1,6 @@
 # $Id$
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul
 
 TESTS = simple
 

tests/simple.c

@@ -13,13 +13,8 @@
  */
 
 #include "config.h"
-#include "common.h"
-
 
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <stdlib.h>
 #endif

tools/Makefile.am

@@ -1,6 +1,7 @@
 # $Id$
 
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
+              -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
 
 noinst_PROGRAMS = optipal sortchars $(pango_programs)
 

tools/makefont.c

@@ -16,23 +16,22 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 
-#if defined(HAVE_ARPA_INET_H)
+#if defined HAVE_ARPA_INET_H
 #   include <arpa/inet.h>
-#elif defined(HAVE_NETINET_IN_H)
+#elif defined HAVE_NETINET_IN_H
 #   include <netinet/in.h>
 #endif
 
-#include "cucul.h"
-
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
 
+#include "cucul.h"
+
 /* Split our big strings into chunks of 480 characters, because it is
  * the multiple of 32 directly below 509, which is the maximum allowed
  * string size in C89. */
@@ -437,13 +436,13 @@ static int printf_unicode(struct glyph *g)
 
 static int printf_u32(char const *fmt, uint32_t i)
 {
-    uint32_t ni = hton32(i);
+    uint32_t ni = htonl(i);
     return printf_hex(fmt, (uint8_t *)&ni, 4);
 }
 
 static int printf_u16(char const *fmt, uint16_t i)
 {
-    uint16_t ni = hton16(i);
+    uint16_t ni = htons(i);
     return printf_hex(fmt, (uint8_t *)&ni, 2);
 }
 

tools/optipal.c

@@ -13,7 +13,6 @@
  */
 
 #include "config.h"
-#include "common.h"
 
 #if !defined(__KERNEL__)
 #   include <stdio.h>

tools/sortchars.c

@@ -13,15 +13,13 @@
  */
 
 #include "config.h"
-#include "common.h"
+
 #if !defined(__KERNEL__)
-#   if defined(HAVE_INTTYPES_H)
-#      include <inttypes.h>
-#   endif
 #   include <stdio.h>
 #   include <string.h>
 #   include <stdlib.h>
 #endif
+
 #include "cucul.h"
 
 #define GLYPHS 0x7f