Changeset 2299


Ignore:
Timestamp:
Apr 19, 2008, 2:42:50 PM (11 years ago)
Author:
Sam Hocevar
Message:
  • 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.
Location:
libcaca/trunk
Files:
3 added
1 deleted
84 edited
1 moved

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/Makefile.am

    r2103 r2299  
    44DIST_SUBDIRS = $(SUBDIRS) msvc
    55
    6 EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in common.h libcaca.spec
     6EXTRA_DIST = NOTES COPYING.GPL COPYING.LGPL bootstrap build-dos build-kernel build-win32 caca-config.in stubs.h libcaca.spec
    77AUTOMAKE_OPTIONS = dist-bzip2
    88
  • libcaca/trunk/build-dos

    r975 r2299  
    1919cd "${BUILDDIR}"
    2020# Build for DOS
    21 "${SRCDIR}/configure" --host=i386-pc-msdosdjgpp --prefix=/ --bindir=/ --libdir=/ --disable-imlib2 --disable-doc
     21"${SRCDIR}/configure" --host=i386-pc-msdosdjgpp --prefix=/ --bindir=/ --libdir=/ --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx
    2222make pkglibdir=/lib pkgdatadir=/data
    2323# Install into our private directory
     
    2929
    3030mkdir "${INSTALLDIR}/doc"
    31 for f in COPYING COPYING.LGPL COPYING.GPL README AUTHORS NEWS NOTES THANKS TODO; do
     31for f in COPYING COPYING.LGPL COPYING.GPL README AUTHORS NEWS NOTES THANKS; do
    3232   sed -e 's/$/^M/' < "${SRCDIR}/${f}" > "${INSTALLDIR}/doc/${f}.txt"
    3333done
  • libcaca/trunk/build-kernel

    r2054 r2299  
    77set -e
    88
    9 CFLAGS="-fno-builtin -O2 -I. -I.. -Wall"
     9CFLAGS="-fno-builtin -O2 -I. -I.. -I../cucul/ -Wall"
    1010CPPFLAGS="-D__KERNEL__ -nostdinc -include kernel/kernel.h"
    1111LDFLAGS="-nostdlib -Wl,-N -Wl,-Ttext -Wl,100000"
  • libcaca/trunk/build-win32

    r975 r2299  
    3535
    3636mkdir "${INSTALLDIR}/doc"
    37 for f in COPYING COPYING.LGPL COPYING.GPL README AUTHORS NEWS NOTES THANKS TODO; do
     37for f in COPYING COPYING.LGPL COPYING.GPL README AUTHORS NEWS NOTES THANKS; do
    3838   sed -e 's/$/
    3939/' < "${SRCDIR}/${f}" > "${INSTALLDIR}/doc/${f}.txt"
  • libcaca/trunk/caca/Makefile.am

    r2087 r2299  
    44DISTCLEANFILES = caca.pc
    55
    6 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -DPLUGINDIR=\"$(plugindir)\"
     6AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
     7              -DPLUGINDIR=\"$(plugindir)\"
    78
    89pkgconfig_DATA = caca.pc
  • libcaca/trunk/caca/caca.c

    r2139 r2299  
    2020
    2121#include "config.h"
    22 #include "common.h"
    2322
    2423#if !defined(__KERNEL__)
  • libcaca/trunk/caca/caca0.c

    r2049 r2299  
    1919
    2020#include "config.h"
    21 #include "common.h"
    2221
    2322#if !defined(__KERNEL__)
  • libcaca/trunk/caca/caca_internals.h

    r2138 r2299  
    1616#define __CACA_INTERNALS_H__
    1717
    18 #if defined(HAVE_INTTYPES_H) && !defined(__KERNEL__)
    19 #   include <inttypes.h>
    20 #endif
     18#include "stubs.h"
    2119
    2220typedef struct caca_timer caca_timer_t;
  • libcaca/trunk/caca/driver_conio.c

    r2138 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if defined(USE_CONIO)
  • libcaca/trunk/caca/driver_gl.c

    r2141 r2299  
    2020
    2121#include "config.h"
    22 #include "common.h"
    2322
    2423#if defined(USE_GL)
  • libcaca/trunk/caca/driver_ncurses.c

    r2142 r2299  
    1919
    2020#include "config.h"
    21 #include "common.h"
    2221
    2322#if defined USE_NCURSES
  • libcaca/trunk/caca/driver_raw.c

    r2138 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if !defined(__KERNEL__)
  • libcaca/trunk/caca/driver_slang.c

    r2142 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if defined(USE_SLANG)
  • libcaca/trunk/caca/driver_vga.c

    r2138 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if defined(USE_VGA)
  • libcaca/trunk/caca/driver_win32.c

    r2138 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if defined(USE_WIN32)
  • libcaca/trunk/caca/driver_x11.c

    r2138 r2299  
    1919
    2020#include "config.h"
    21 #include "common.h"
    2221
    2322#if defined(USE_X11)
  • libcaca/trunk/caca/event.c

    r2140 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if !defined(__KERNEL__)
  • libcaca/trunk/caca/graphics.c

    r2056 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if !defined(__KERNEL__)
  • libcaca/trunk/caca/time.c

    r1462 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if !defined(__KERNEL__)
  • libcaca/trunk/configure.ac

    r2265 r2299  
    8888  [  --enable-zzuf           use zzuf for fuzzing tests (autodetected)])
    8989
    90 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)
     90AC_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)
    9191AC_CHECK_FUNCS(signal ioctl snprintf vsnprintf getenv putenv strcasecmp htons)
    9292AC_CHECK_FUNCS(usleep gettimeofday)
     
    324324AC_SUBST(GL_LIBS)
    325325
     326# How to get the C99 types. See cucul/cucul_types.h.in for details about
     327# the CUCUL_TYPES variable
     328if test "${ac_cv_my_have_vga}" = "yes"; then
     329  CUCUL_TYPES=0
     330else
     331  AC_CHECK_HEADERS(stdint.h,
     332    [CUCUL_TYPES=1],
     333    [AC_CHECK_HEADERS(inttypes.h,
     334      [CUCUL_TYPES=2],
     335      [CUCUL_TYPES=0])])
     336fi
     337AC_SUBST(CUCUL_TYPES)
     338
    326339# Optimizations
    327340CFLAGS="${CFLAGS} -g -O2 -fno-strength-reduce -fomit-frame-pointer"
     
    463476])
    464477AC_CONFIG_FILES([
     478  cucul/cucul_types.h
    465479  cucul/cucul.pc
    466480  caca/caca.pc
  • libcaca/trunk/cucul/Makefile.am

    r2110 r2299  
    11# $Id$
    22
    3 EXTRA_DIST = cucul.pc.in mono9.data monobold12.data
    4 DISTCLEANFILES = cucul.pc
     3EXTRA_DIST = cucul_types.h.in cucul.pc.in mono9.data monobold12.data
     4DISTCLEANFILES = cucul_types.h cucul.pc
    55
    66pkgconfig_DATA = cucul.pc
    77pkgconfigdir = $(libdir)/pkgconfig
    88
    9 include_HEADERS = cucul.h
     9include_HEADERS = cucul.h cucul_types.h
    1010
    1111lib_LTLIBRARIES = libcucul.la
     
    1414        cucul.c \
    1515        cucul.h \
     16        cucul_types.h \
    1617        cucul_internals.h \
    1718        legacy.c \
     
    3637        monobold12.data \
    3738        $(NULL)
    38 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul
     39AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul
    3940libcucul_la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
    4041libcucul_la_LIBADD = $(ZLIB_LIBS)
  • libcaca/trunk/cucul/attr.c

    r2057 r2299  
    1919
    2020#include "config.h"
    21 #include "common.h"
    2221
    2322#include "cucul.h"
  • libcaca/trunk/cucul/box.c

    r2079 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/canvas.c

    r2294 r2299  
    1919
    2020#include "config.h"
    21 #include "common.h"
    2221
    2322#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/charset.c

    r2128 r2299  
    2020
    2121#include "config.h"
    22 #include "common.h"
    2322
    2423#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/conic.c

    r2256 r2299  
    1919
    2020#include "config.h"
    21 #include "common.h"
    2221
    2322#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/cucul.c

    r2111 r2299  
    1919
    2020#include "config.h"
    21 #include "common.h"
    2221
    2322#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/cucul.h

    r2111 r2299  
    2424#ifndef __CUCUL_H__
    2525#define __CUCUL_H__
     26
     27#include <cucul_types.h>
    2628
    2729#undef __extern
  • libcaca/trunk/cucul/cucul_internals.h

    r2111 r2299  
    1616#define __CUCUL_INTERNALS_H__
    1717
    18 #if defined(HAVE_INTTYPES_H) && !defined(__KERNEL__)
    19 #   include <inttypes.h>
    20 #endif
     18#include "stubs.h"
    2119
    2220typedef struct cucul_figfont cucul_figfont_t;
  • libcaca/trunk/cucul/dither.c

    r2043 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/export.c

    r2147 r2299  
    1919
    2020#include "config.h"
    21 #include "common.h"
    2221
    2322#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/figfont.c

    r2225 r2299  
    2222
    2323#include "config.h"
    24 #include "common.h"
    2524
    2625#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/file.c

    r2144 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if !defined __KERNEL__
  • libcaca/trunk/cucul/font.c

    r2057 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/frame.c

    r2043 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/import.c

    r1784 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if !defined __KERNEL__
  • libcaca/trunk/cucul/legacy.c

    r1881 r2299  
    1919
    2020#include "config.h"
    21 #include "common.h"
    2221
    2322#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/line.c

    r1947 r2299  
    1919
    2020#include "config.h"
    21 #include "common.h"
    2221
    2322#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/transform.c

    r1820 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if !defined(__KERNEL__)
  • libcaca/trunk/cucul/triangle.c

    r1462 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    2120
    2221#if !defined(__KERNEL__)
  • libcaca/trunk/cxx/Makefile.am

    r2087 r2299  
    11# $Id: Makefile.am 552 2006-04-13 16:10:16Z jylam $
    22
    3 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca
     3AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
     4              -I$(top_srcdir)/caca
    45
    56if USE_CXX
  • libcaca/trunk/examples/Makefile.am

    r2138 r2299  
    11# $Id$
    22
    3 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
     3AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
     4              -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
    45
    56noinst_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
  • libcaca/trunk/examples/blit.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
     16
    1717#if !defined(__KERNEL__)
    1818#   include <stdio.h>
  • libcaca/trunk/examples/colors.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
  • libcaca/trunk/examples/cucul.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
  • libcaca/trunk/examples/demo.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
     16
    1717#if !defined(__KERNEL__)
    1818#   include <math.h>
     
    2020#   include <stdio.h>
    2121#endif
     22
     23#include "cucul.h"
    2224#include "caca.h"
    2325
  • libcaca/trunk/examples/dithering.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
  • libcaca/trunk/examples/driver.c

    r2139 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
  • libcaca/trunk/examples/event.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
     16
    1717#if !defined(__KERNEL__)
    1818#   include <stdio.h>
  • libcaca/trunk/examples/export.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
    19 #   if defined(HAVE_INTTYPES_H)
    20 #      include <inttypes.h>
    21 #   endif
    2218#   include <stdio.h>
    2319#   include <stdlib.h>
  • libcaca/trunk/examples/figfont.c

    r2111 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
  • libcaca/trunk/examples/font.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
    19 #   if defined(HAVE_INTTYPES_H)
    20 #      include <inttypes.h>
    21 #   endif
    22 
    2318#   if defined(HAVE_ENDIAN_H)
    2419#      include <endian.h>
  • libcaca/trunk/examples/font2tga.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
    19 #   if defined(HAVE_INTTYPES_H)
    20 #      include <inttypes.h>
    21 #   endif
    2218#   include <stdio.h>
    2319#   include <stdlib.h>
  • libcaca/trunk/examples/frames.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
     16
    1717#if !defined(__KERNEL__)
    18 #   if defined(HAVE_INTTYPES_H)
    19 #      include <inttypes.h>
    20 #   endif
    21 
    2218#   include <stdio.h>
    2319#endif
     20
    2421#include "cucul.h"
    2522#include "caca.h"
  • libcaca/trunk/examples/fullwidth.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
    19 #   if defined(HAVE_INTTYPES_H)
    20 #      include <inttypes.h>
    21 #   endif
    2218#   include <stdio.h>
    2319#endif
  • libcaca/trunk/examples/gamma.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
    19 #   if defined(HAVE_INTTYPES_H)
    20 #      include <inttypes.h>
    21 #   endif
    2218#   include <stdio.h>
    2319#   include <math.h>
  • libcaca/trunk/examples/hsv.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
    19 #   if defined(HAVE_INTTYPES_H)
    20 #      include <inttypes.h>
    21 #   endif
    2218#   include <stdio.h>
    2319#endif
  • libcaca/trunk/examples/import.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    17 
    1816
    1917#if !defined(__KERNEL__)
    20 #   if defined(HAVE_INTTYPES_H)
    21 #      include <inttypes.h>
    22 #   endif
    2318#   include <stdio.h>
    2419#   include <stdlib.h>
    2520#endif
    26 
    2721
    2822#include "cucul.h"
  • libcaca/trunk/examples/input.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
    19 #   if defined(HAVE_INTTYPES_H)
    20 #       include <inttypes.h>
    21 #   endif
    2218#   include <string.h>
    2319#   include <stdio.h>
  • libcaca/trunk/examples/spritedit.c

    r2147 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
  • libcaca/trunk/examples/swallow.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
     16
    1717#if !defined(__KERNEL__)
    1818#   include <stdio.h>
  • libcaca/trunk/examples/text.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
     16
    1717#if !defined(__KERNEL__)
    18 #   if defined(HAVE_INTTYPES_H)
    19 #      include <inttypes.h>
    20 #   endif
    2118#   include <stdio.h>
    2219#   include <string.h>
    2320#   include <stdlib.h>
    2421#endif
     22
    2523#include "cucul.h"
    2624
  • libcaca/trunk/examples/transform.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
     16
    1717#if !defined(__KERNEL__)
    18 #   if defined(HAVE_INTTYPES_H)
    19 #      include <inttypes.h>
    20 #   endif
    2118#   include <stdio.h>
    2219#   include <string.h>
  • libcaca/trunk/examples/truecolor.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
    19 #   if defined(HAVE_INTTYPES_H)
    20 #      include <inttypes.h>
    21 #   endif
    2218#   include <stdio.h>
    2319#endif
  • libcaca/trunk/examples/unicode.c

    r2101 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
    19 #   if defined(HAVE_INTTYPES_H)
    20 #      include <inttypes.h>
    21 #   endif
    2218#   include <stdio.h>
    2319#endif
  • libcaca/trunk/kernel/kernel.c

    r2144 r2299  
    2121
    2222#include "config.h"
    23 #include "common.h"
     23
     24#include "cucul_types.h"
    2425
    2526#ifdef __KERNEL__
  • libcaca/trunk/msvc/Makefile.am

    r2069 r2299  
    55EXTRA_DIST = libcaca.sln \
    66             config.h \
    7              common.h \
     7             cucul_types.h \
    88             libcucul.vcproj \
    99             libcaca.vcproj \
  • libcaca/trunk/ruby/Makefile.am

    r2097 r2299  
    1212CFLAGS += -Wno-strict-prototypes -Wno-missing-prototypes
    1313
    14 cucul_la_CPPFLAGS = -I$(top_srcdir)/cucul $(RUBY_CFLAGS)
     14cucul_la_CPPFLAGS = -I$(top_srcdir)/cucul -I../cucul $(RUBY_CFLAGS)
    1515cucul_la_SOURCES = cucul.c \
    1616                   common.h \
     
    2525cucul_la_LIBADD = ../cucul/libcucul.la
    2626
    27 caca_la_CPPFLAGS = -I$(top_srcdir)/caca -I$(top_srcdir)/cucul $(RUBY_CFLAGS)
     27caca_la_CPPFLAGS = -I$(top_srcdir)/caca -I$(top_srcdir)/cucul -I../cucul \
     28                   $(RUBY_CFLAGS)
    2829caca_la_SOURCES = caca.c \
    2930                  common.h \
  • libcaca/trunk/src/Makefile.am

    r2248 r2299  
    44
    55EXTRA_DIST = caca.txt
    6 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DLIBCACA=1 -DX_DISPLAY_MISSING=1
     6AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
     7              -I$(top_srcdir)/caca -DLIBCACA=1 -DX_DISPLAY_MISSING=1
    78
    89bin_PROGRAMS = cacademo cacafire cacaplay cacaview img2txt $(fcntl_programs)
  • libcaca/trunk/src/aafire.c

    r2105 r2299  
    2525#ifdef LIBCACA
    2626#include "config.h"
    27 #include "common.h"
    2827#if !defined(__KERNEL__)
    2928#   include <stdio.h>
     
    3130#   include <string.h>
    3231#endif
     32#include "cucul.h"
    3333#include "caca.h"
    3434#else
  • libcaca/trunk/src/cacademo.c

    r2254 r2299  
    1616
    1717#include "config.h"
    18 #include "common.h"
    1918
    2019#if !defined(__KERNEL__)
  • libcaca/trunk/src/cacadraw.c

    r2049 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
  • libcaca/trunk/src/cacaplay.c

    r2049 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
  • libcaca/trunk/src/cacaserver.c

    r1914 r2299  
    1515
    1616#include "config.h"
    17 #include "common.h"
    1817
    1918#include <stdio.h>
  • libcaca/trunk/src/cacaview.c

    r2049 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
     
    2827#include "cucul.h"
    2928#include "caca.h"
     29
    3030#include "common-image.h"
    3131
  • libcaca/trunk/src/common-image.c

    r1462 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
     
    3130
    3231#include "cucul.h"
     32
    3333#include "common-image.h"
    3434
  • libcaca/trunk/src/img2txt.c

    r2107 r2299  
    1515
    1616#include "config.h"
    17 #include "common.h"
    1817
    1918#if !defined(__KERNEL__)
     
    3635
    3736#include "cucul.h"
     37
    3838#include "common-image.h"
    3939
  • libcaca/trunk/src/mygetopt.c

    r2248 r2299  
    1818
    1919#include "config.h"
    20 #include "common.h"
    21 
    22 #if defined HAVE_STDINT_H
    23 #   include <stdint.h>
    24 #elif defined HAVE_INTTYPES_H
    25 #   include <inttypes.h>
    26 #endif
    2720
    2821#include <stdio.h>
    2922#include <string.h>
     23
     24#include "cucul_types.h"
    3025
    3126#include "mygetopt.h"
  • libcaca/trunk/stubs.h

    r2298 r2299  
    1818 */
    1919
    20 /* C99 types */
    21 #if defined HAVE_INTTYPES_H && !defined __KERNEL__
    22 #   include <inttypes.h>
    23 #else
    24 typedef signed char int8_t;
    25 typedef signed short int16_t;
    26 typedef signed long int int32_t;
    27 
    28 typedef unsigned char uint8_t;
    29 typedef unsigned short uint16_t;
    30 typedef unsigned long int uint32_t;
    31 
    32 typedef long int intptr_t;
    33 typedef unsigned long int uintptr_t;
    34 #endif
     20#ifndef __STUBS_H__
     21#define __STUBS_H__
    3522
    3623/* errno handling */
     
    10895#endif
    10996
     97#endif /* __STUBS_H__ */
     98
  • libcaca/trunk/tests/Makefile.am

    r2103 r2299  
    11# $Id$
    22
    3 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul
     3AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul
    44
    55TESTS = simple
  • libcaca/trunk/tests/simple.c

    r2103 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    17 
    1816
    1917#if !defined(__KERNEL__)
    20 #   if defined(HAVE_INTTYPES_H)
    21 #      include <inttypes.h>
    22 #   endif
    2318#   include <stdio.h>
    2419#   include <stdlib.h>
  • libcaca/trunk/tools/Makefile.am

    r1840 r2299  
    11# $Id$
    22
    3 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
     3AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/cucul -I../cucul \
     4              -I$(top_srcdir)/caca -DDATADIR=\"$(pkgdatadir)\"
    45
    56noinst_PROGRAMS = optipal sortchars $(pango_programs)
  • libcaca/trunk/tools/makefont.c

    r1768 r2299  
    1717
    1818#include "config.h"
    19 #include "common.h"
    2019
    2120#include <stdio.h>
     
    2322#include <stdint.h>
    2423
    25 #if defined(HAVE_ARPA_INET_H)
     24#if defined HAVE_ARPA_INET_H
    2625#   include <arpa/inet.h>
    27 #elif defined(HAVE_NETINET_IN_H)
     26#elif defined HAVE_NETINET_IN_H
    2827#   include <netinet/in.h>
    2928#endif
    3029
    31 #include "cucul.h"
    32 
    3330#include <pango/pango.h>
    3431#include <pango/pangoft2.h>
     32
     33#include "cucul.h"
    3534
    3635/* Split our big strings into chunks of 480 characters, because it is
     
    438437static int printf_u32(char const *fmt, uint32_t i)
    439438{
    440     uint32_t ni = hton32(i);
     439    uint32_t ni = htonl(i);
    441440    return printf_hex(fmt, (uint8_t *)&ni, 4);
    442441}
     
    444443static int printf_u16(char const *fmt, uint16_t i)
    445444{
    446     uint16_t ni = hton16(i);
     445    uint16_t ni = htons(i);
    447446    return printf_hex(fmt, (uint8_t *)&ni, 2);
    448447}
  • libcaca/trunk/tools/optipal.c

    r1462 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
    1716
    1817#if !defined(__KERNEL__)
  • libcaca/trunk/tools/sortchars.c

    r1871 r2299  
    1414
    1515#include "config.h"
    16 #include "common.h"
     16
    1717#if !defined(__KERNEL__)
    18 #   if defined(HAVE_INTTYPES_H)
    19 #      include <inttypes.h>
    20 #   endif
    2118#   include <stdio.h>
    2219#   include <string.h>
    2320#   include <stdlib.h>
    2421#endif
     22
    2523#include "cucul.h"
    2624
Note: See TracChangeset for help on using the changeset viewer.