* Removed duplicate uint*_t defines from *_internal.h and included common.h

in all .c files that needed it.

caca/caca.c

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

caca/caca_internals.h

@@ -16,13 +16,6 @@
 
 #if defined(HAVE_INTTYPES_H) && !defined(__KERNEL__)
 #   include <inttypes.h>
-#elif !defined(CUSTOM_INTTYPES) && !defined(_DOXYGEN_SKIP_ME)
-#   define CUSTOM_INTTYPES
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned long int uint32_t;
-typedef long int intptr_t;
-typedef long unsigned int uintptr_t;
 #endif
 
 typedef struct caca_timer caca_timer_t;

caca/driver_conio.c

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

caca/driver_gl.c

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

caca/driver_ncurses.c

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

caca/driver_raw.c

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

caca/driver_slang.c

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

caca/driver_vga.c

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

caca/driver_win32.c

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

caca/driver_x11.c

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

caca/event.c

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

caca/graphics.c

@@ -16,6 +16,7 @@
  */
 
 #include "config.h"
+#include "common.h"
 
 #include "caca.h"
 #include "caca_internals.h"

caca/time.c

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

common.h

@@ -21,8 +21,12 @@
 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
 

configure.ac

@@ -61,8 +61,8 @@ dnl conditional builds
 AC_ARG_ENABLE(doc,
   [  --enable-doc            build documentation (needs doxygen and LaTeX)])
 
-AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h inttypes.h endian.h unistd.h)
-AC_CHECK_FUNCS(signal ioctl vsnprintf getenv putenv strcasecmp)
+AC_CHECK_HEADERS(stdio.h stdarg.h signal.h sys/ioctl.h sys/time.h inttypes.h endian.h unistd.h arpa/inet.h)
+AC_CHECK_FUNCS(signal ioctl vsnprintf getenv putenv strcasecmp htons)
 AC_CHECK_FUNCS(usleep gettimeofday)
 
 AC_MSG_CHECKING(for Sleep)

cucul/box.c

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

cucul/buffer.c

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

cucul/canvas.c

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

cucul/charset.c

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

cucul/colour.c

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

cucul/conic.c

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

cucul/cucul.c

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

cucul/cucul_internals.h

@@ -16,13 +16,6 @@
 
 #if defined(HAVE_INTTYPES_H) && !defined(__KERNEL__)
 #   include <inttypes.h>
-#elif !defined(CUSTOM_INTTYPES) && !defined(_DOXYGEN_SKIP_ME)
-#   define CUSTOM_INTTYPES
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned long int uint32_t;
-typedef long int intptr_t;
-typedef long unsigned int uintptr_t;
 #endif
 
 struct cucul_canvas

cucul/dither.c

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

cucul/export.c

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

cucul/font.c

@@ -16,16 +16,19 @@
  */
 
 #include "config.h"
+#include "common.h"
 
 #if !defined(USE_WIN32)
 #if !defined(__KERNEL__)
 #   if defined(HAVE_ENDIAN_H)
 #       include <endian.h>
 #   endif
+#   if defined(HAVE_ARPA_INET_H)
+#       include <arpa/inet.h>
+#   endif
 #   include <stdio.h>
 #   include <stdlib.h>
 #   include <string.h>
-#   include <arpa/inet.h>
 #endif
 
 #include "cucul.h"

cucul/import.c

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

cucul/line.c

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

cucul/sprite.c

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

cucul/transform.c

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

cucul/triangle.c

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

kernel/kernel.c

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

src/aafire.c

@@ -24,6 +24,7 @@
 
 #ifdef LIBCACA
 #include "config.h"
+#include "common.h"
 #if !defined(__KERNEL__)
 #   include <stdio.h>
 #   include <stdlib.h>

src/cacaball.c

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

src/cacamoir.c

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

src/cacaplas.c

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

src/cacaplay.c

@@ -12,6 +12,7 @@
  */
 
 #include "config.h"
+#include "common.h"
 
 #include <stdio.h>
 #include <sys/types.h>

src/cacaserver.c

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

src/cacaview.c

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

src/common-image.c

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

src/img2irc.c

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

test/colors.c

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

test/demo.c

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

test/dithering.c

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

test/event.c

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

test/spritedit.c

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

tools/makefont.c

@@ -14,11 +14,16 @@
  *   makefont <prefix> <font> <dpi> <bpp>
  */
 
+#include "config.h"
+#include "common.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
 
-#include <arpa/inet.h>
+#if defined(HAVE_ARPA_INET_H)
+#   include <arpa/inet.h>
+#endif
 
 #include <pango/pango.h>
 #include <pango/pangoft2.h>

tools/optipal.c

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