Changeset bffdb82 in rtems


Ignore:
Timestamp:
11/05/04 11:34:49 (19 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
1c89b86
Parents:
9bb5b9d
Message:

2004-11-05 Ralf Corsepius <ralf_corsepiu@…>

  • configure.ac: Remove RTEMS_USES_INTTYPES_H. Require inttypes.h.
  • include/rtems/stdint.h: Remove "wild guesses", require inttypes.h.
  • libcsupport/include/inttypes.h: Cleanup.
  • libcsupport/include/stdint.h: Cleanup.
Location:
cpukit
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • cpukit/ChangeLog

    r9bb5b9d rbffdb82  
     12004-11-05      Ralf Corsepius <ralf_corsepiu@rtems.org>
     2
     3        * configure.ac: Remove RTEMS_USES_INTTYPES_H. Require inttypes.h.
     4        * include/rtems/stdint.h: Remove "wild guesses", require inttypes.h.
     5        * libcsupport/include/inttypes.h: Cleanup.
     6        * libcsupport/include/stdint.h: Cleanup.
     7
    182004-11-04      Ralf Corsepius <ralf_corsepiu@rtems.org>
    29

  • cpukit/configure.ac

    r9bb5b9d rbffdb82  
    9090
    9191## Check if the installed toolchain has these headers
    92 AC_CHECK_HEADER(stdint.h)
    93 AC_CHECK_HEADER(inttypes.h)
    94 
    95 AS_IF([test x"${RTEMS_USE_NEWLIB}" = x"yes"],[
    96   RTEMS_USES_STDINT_H=yes
    97   RTEMS_USES_INTTYPES_H=yes],[
    98   RTEMS_USES_STDINT_H=$ac_cv_header_stdint_h
    99   RTEMS_USES_INTTYPES_H=$ac_cv_header_inttypes_h
    100 ])
    101 
    102 AM_CONDITIONAL(RTEMS_PROVIDES_STDINT_H,
    103 [test x"${RTEMS_USE_NEWLIB}" = x"yes" \
    104 && test x"$ac_cv_header_stdint_h" = xno])
    105 AM_CONDITIONAL(RTEMS_PROVIDES_INTTYPES_H,
    106 [test x"${RTEMS_USE_NEWLIB}" = x"yes" \
    107 && test x"$ac_cv_header_inttypes_h" = xno])
     92AC_CHECK_HEADER([stdint.h])
     93AC_CHECK_HEADER([inttypes.h])
     94
     95## if using newlib, we provide stdint.h and inttypes.h
     96AM_CONDITIONAL([RTEMS_PROVIDES_STDINT_H],[test x"${RTEMS_USE_NEWLIB}" = xyes])
     97AM_CONDITIONAL([RTEMS_PROVIDES_INTTYPES_H],[test x"${RTEMS_USE_NEWLIB}" = xyes])
     98
     99## if using newlib, force using stdint.h
     100AS_IF([test x"${RTEMS_USE_NEWLIB}" = xyes],
     101[RTEMS_USES_STDINT_H=yes],
     102[RTEMS_USES_STDINT_H=$ac_cv_header_stdint_h])
    108103
    109104AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
    … …  
    181176  [1],
    182177  [if RTEMS uses stdint.h])
    183 
    184 RTEMS_CPUOPT([RTEMS_USES_INTTYPES_H],
    185   [test x"${RTEMS_USES_INTTYPES_H}" = x"yes"],
    186   [1],
    187   [if RTEMS uses inttypes.h])
    188178
    189179RTEMS_CPUOPT([RTEMS_VERSION],

  • cpukit/include/rtems/stdint.h

    r9bb5b9d rbffdb82  
    1 /* 
    2  * rtems/stdint.h
     1/**
     2 * @file  rtems/stdint.h
    33 *
    4  * ISO C99 integer types
    5  *
     4 * Wrapper to <stdint.h>, switching to <inttypes.h> on systems
     5 * only having <inttypes.h> (e.g. Solaris-5.7).
     6 */
     7 
     8/*
    69 * $Id$
    710 */
    … …  
    1013#define __rtems_stdint_h
    1114
    12 #ifdef __cplusplus
    13 extern "C" {
    14 #endif
    15 
    1615#include <rtems/score/cpuopts.h>
    1716
    … …  
    1918#include <stdint.h>
    2019
    21 #elif RTEMS_USES_INTTYPES_H
     20#else
    2221#include <inttypes.h>
    23 
    24 #else
    25 /*
    26  * Wild guesses on systems not providing stdint.h nor inttypes.h
    27  * Known to work on Cywgin-1.3
    28  */
    29  
    30 #include <sys/types.h>
    31 
    32 #if !defined(uint8_t) && defined(__uint8_t)
    33 typedef __uint8_t uint8_t;
    34 #endif
    35 
    36 #if !defined(uint16_t) && defined(__uint16_t)
    37 typedef __uint16_t uint16_t;
    38 #endif
    39 
    40 #if !defined(uint32_t) && defined(__uint32_t)
    41 typedef __uint32_t uint32_t;
    42 #endif
    43 
    44 #if !defined(uint64_t) && defined(__uint64_t)
    45 typedef __uint64_t uint64_t;
    4622#endif
    4723
    4824#endif
    49 
    50 #ifdef __cplusplus
    51 }
    52 #endif
    53 
    54 #endif

  • cpukit/libcsupport/include/inttypes.h

    r9bb5b9d rbffdb82  
    22 * @file inttypes.h
    33 */
    4 
     4 
    55/*
    6  * ISO C99 Format conversion of integer types.
    7  *
    86 *  $Id$
    97 */
    … …  
    1210#define __INTTYPES_H
    1311
    14 #ifdef __cplusplus
    15 extern "C" {
    16 #endif
    17 
    1812#include <stdint.h>
    1913#include <sys/_inttypes.h>
    2014
    21 #ifdef __cplusplus
    22 }
    2315#endif
    24 
    25 #endif

  • cpukit/libcsupport/include/stdint.h

    r9bb5b9d rbffdb82  
    44
    55/*
    6  * ISO C99 integer types
    7  *
    86 * $Id$
    97 */
    … …  
    1210#define __STDINT_H
    1311
    14 #ifdef __cplusplus
    15 extern "C" {
    16 #endif
    17 
    1812#include <sys/_stdint.h>
    1913
    20 #ifdef __cplusplus
    21 }
    2214#endif
    23 
    24 #endif
Note: See TracChangeset for help on using the changeset viewer.