Merger from rtems-4.6-branch

This commit is contained in:
Ralf Corsepius
2003-05-30 11:49:08 +00:00
parent 011e3b3f3c
commit 3f4876a5d1
5 changed files with 23 additions and 6 deletions

View File

@@ -1,3 +1,8 @@
2003-05-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Conditionally install stdint.h/inttypes.h.
* configure.ac: Check for system-stdint.h/inttypes.h.
2003-05-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
PR 409:

View File

@@ -12,7 +12,12 @@ include_HEADERS = include/chain.h include/console.h include/clockdrv.h \
include/iosupp.h include/ringbuf.h include/rtc.h \
include/spurious.h include/timerdrv.h include/vmeintr.h
LIBC_HFILES = include/stdint.h include/inttypes.h
if NEED_STDINT_H
LIBC_HFILES = include/stdint.h
endif
if NEED_INTTYPES_H
LIBC_HFILES += include/inttypes.h
endif
include_HEADERS += $(LIBC_HFILES)
PREINSTALL_FILES = $(PROJECT_INCLUDE) \

View File

@@ -27,14 +27,15 @@ AM_CONDITIONAL(UNIX,test x"$RTEMS_CPU" = x"unix")
AM_CONDITIONAL(NEWLIB,test x"$RTEMS_USE_NEWLIB" = x"yes")
AS_IF([test x"$RTEMS_USE_NEWLIB" != x"yes"],[
## Provide sys/cdefs.h only if the host doesn't.
## Provide headers only if the host doesn't.
AC_CHECK_HEADERS([sys/cdefs.h],[NEED_SYS_CDEFS_H=no],[NEED_SYS_CDEFS_H=yes])
# FIXME: These checks are only in here to provide
# configuration-time diagnostics and are not really used.
AC_CHECK_HEADERS([stdint.h inttypes.h])
AC_CHECK_HEADERS([stdint.h],[NEED_STDINT_H=no],[NEED_STDINT_H=yes])
AC_CHECK_HEADERS([inttypes.h],[NEED_INTTYPES_H=no],[NEED_INTTYPES=yes])
],[
## Using newlib, we provide sys/cdefs.h
NEED_SYS_CDEFS_H=yes
NEED_STDINT_H=yes
NEED_INTTYPES_H=yes
])
# FIXME: These checks are only in here to provide
@@ -75,6 +76,8 @@ AC_CHECK_DECLS([sbrk],,,[#include <unistd.h>])
AC_CHECK_FUNCS(strlcpy strlcat)
AM_CONDITIONAL([NEED_SYS_CDEFS_H],[test x"$NEED_SYS_CDEFS_H" = x"yes"])
AM_CONDITIONAL([NEED_STDINT_H],[test x"$NEED_STDINT_H" = x"yes"])
AM_CONDITIONAL([NEED_INTTYPES_H],[test x"$NEED_INTTYPES_H" = x"yes"])
AM_CONFIG_HEADER([src/config.h])

View File

@@ -1,3 +1,7 @@
2003-05-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems/rtems/types.h: Include stdint.h.
2003-05-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
PR 409:

View File

@@ -23,7 +23,7 @@ extern "C" {
* RTEMS basic type definitions
*/
#include <rtems/stdint.h>
#include <stdint.h>
/* backward compatibility types */
typedef uint8_t rtems_unsigned8;