Ignore:
Timestamp:
Sep 27, 2008, 3:12:46 PM (11 years ago)
Author:
Sam Hocevar
Message:

Starting refactoring to get rid of libcucul. The initial reason for the
split is rendered moot by the plugin system: when enabled, binaries do
not link directly with libX11 or libGL. I hope this is a step towards
more consisteny and clarity.

File:
1 copied

Legend:

Unmodified
Added
Removed
  • libcaca/trunk/caca/caca_types.h.in

    r2819 r2821  
    11/*
    2  *  libcucul      Canvas for ultrafast compositing of Unicode letters
     2 *  libcaca       Colour ASCII-Art library
    33 *  libcaca       Colour ASCII-Art library
    44 *  Copyright (c) 2008 Sam Hocevar <sam@zoy.org>
     
    1717 */
    1818
    19 #ifndef __CUCUL_TYPES_H__
    20 #define __CUCUL_TYPES_H__
     19#ifndef __CACA_TYPES_H__
     20#define __CACA_TYPES_H__
    2121
    22 #ifndef CUCUL_TYPES
    23 #   define CUCUL_TYPES @CUCUL_TYPES@
     22#ifndef CACA_TYPES
     23#   define CACA_TYPES @CACA_TYPES@
    2424#endif
    2525
    2626/* mode 1: standard <stdint.h> header is present, just include it */
    27 #if CUCUL_TYPES == 1
     27#if CACA_TYPES == 1
    2828#   include <stdint.h>
    2929#   include <unistd.h>
    3030
    3131/* mode 2: standard <inttypes.h> header is present, just include it */
    32 #elif CUCUL_TYPES == 2
     32#elif CACA_TYPES == 2
    3333#   include <inttypes.h>
    3434#   include <unistd.h>
     
    3636/* mode 3: <windows.h> indicates Win32, only (u)intptr_t is present
    3737 * FIXME: Win64 probably doesn't work that way */
    38 #elif CUCUL_TYPES == 3
     38#elif CACA_TYPES == 3
    3939#include <windows.h>
    4040
     
    5656 * have no idea what other typedefs have already been made. */
    5757#else
    58 typedef signed char _cucul_int8_t;
    59 typedef signed short _cucul_int16_t;
    60 typedef signed long int _cucul_int32_t;
    61 typedef signed long long int _cucul_int64_t;
     58typedef signed char _caca_int8_t;
     59typedef signed short _caca_int16_t;
     60typedef signed long int _caca_int32_t;
     61typedef signed long long int _caca_int64_t;
    6262#   undef int8_t
    63 #   define int8_t _cucul_int8_t
     63#   define int8_t _caca_int8_t
    6464#   undef int16_t
    65 #   define int16_t _cucul_int16_t
     65#   define int16_t _caca_int16_t
    6666#   undef int32_t
    67 #   define int32_t _cucul_int32_t
     67#   define int32_t _caca_int32_t
    6868#   undef int64_t
    69 #   define int64_t _cucul_int64_t
     69#   define int64_t _caca_int64_t
    7070
    71 typedef unsigned char _cucul_uint8_t;
    72 typedef unsigned short _cucul_uint16_t;
    73 typedef unsigned long int _cucul_uint32_t;
    74 typedef unsigned long long int _cucul_uint64_t;
     71typedef unsigned char _caca_uint8_t;
     72typedef unsigned short _caca_uint16_t;
     73typedef unsigned long int _caca_uint32_t;
     74typedef unsigned long long int _caca_uint64_t;
    7575#   undef uint8_t
    76 #   define uint8_t _cucul_uint8_t
     76#   define uint8_t _caca_uint8_t
    7777#   undef uint16_t
    78 #   define uint16_t _cucul_uint16_t
     78#   define uint16_t _caca_uint16_t
    7979#   undef uint32_t
    80 #   define uint32_t _cucul_uint32_t
     80#   define uint32_t _caca_uint32_t
    8181#   undef uint64_t
    82 #   define uint64_t _cucul_uint64_t
     82#   define uint64_t _caca_uint64_t
    8383
    84 typedef long int _cucul_intptr_t;
    85 typedef unsigned long int _cucul_uintptr_t;
     84typedef long int _caca_intptr_t;
     85typedef unsigned long int _caca_uintptr_t;
    8686#   undef intptr_t
    87 #   define intptr_t _cucul_intptr_t
     87#   define intptr_t _caca_intptr_t
    8888#   undef uintptr_t
    89 #   define uintptr_t _cucul_uintptr_t
     89#   define uintptr_t _caca_uintptr_t
    9090
    91 typedef int _cucul_ssize_t;
    92 typedef unsigned int _cucul_size_t;
     91typedef int _caca_ssize_t;
     92typedef unsigned int _caca_size_t;
    9393#   undef ssize_t
    94 #   define ssize_t _cucul_ssize_t
     94#   define ssize_t _caca_ssize_t
    9595#   undef size_t
    96 #   define size_t _cucul_size_t
     96#   define size_t _caca_size_t
    9797
    9898#endif
    9999
    100 #endif /* __CUCUL_TYPES_H__ */
     100#endif /* __CACA_TYPES_H__ */
    101101
Note: See TracChangeset for help on using the changeset viewer.