Ignore:
Timestamp:
Apr 19, 2008, 2:42:50 PM (12 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/src
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • 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"
Note: See TracChangeset for help on using the changeset viewer.