Changeset 4687 for libcaca/trunk


Ignore:
Timestamp:
Oct 9, 2010, 11:58:00 AM (9 years ago)
Author:
Sam Hocevar
Message:

Minor tuning to caca_types.h.

File:
1 edited

Legend:

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

    r4686 r4687  
    1212
    1313/*
    14  *  This file contains definitions for the C99 integer types.
     14 *  This file contains definitions for required C99 integer types.
    1515 */
    1616
     
    1919
    2020#if !defined _MSC_VER
    21     /* FIXME: we should detect platforms with <inttypes.h> and no <stdint.h> */
     21    /* FIXME: detect platforms with <inttypes.h> and no <stdint.h> */
    2222#   include <stdint.h>
    2323#   include <unistd.h>
     24
     25#elif defined _MSC_STDINT_H_ /* msinttypes */ \
     26   || defined NM_DEFINED_FIXED_WIDTH_TYPEDEFS /* Morpheme */
     27    /* Someone already defined things for us: do nothing */
     28
    2429#else
    2530#   if _MSC_VER >= 1600
     
    2732#       include <stdint.h>
    2833#   else
    29 #       include <windows.h>
     34#       include <intsafe.h>
    3035#       if _MSC_VER >= 1300
    3136            typedef signed __int8 int8_t;
     
    4853#       endif
    4954#       if defined _WIN64
    50             /* Win64, only (u)intptr_t and size_t are present */
     55            /* Win64, (u)intptr_t and size_t are present */
    5156            typedef int ssize_t;
    5257#       else
     
    5863#endif
    5964
     65#if 0
    6066/* fallback: nothing is known, we assume the platform is 32-bit and
    6167 * sizeof(long) == sizeof(void *). We don't typedef directly because we
    6268 * have no idea what other typedefs have already been made. */
    63 #if 0
    6469typedef signed char _caca_int8_t;
    6570typedef signed short _caca_int16_t;
Note: See TracChangeset for help on using the changeset viewer.