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/tools
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • 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.