diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-05-30 11:49:08 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-05-30 11:49:08 +0000 |
| commit | 3f4876a5d19b1f783e4263395de810ec398ada91 (patch) | |
| tree | 1bcd8742c67703e2b0cae012b568d84380ee4f8a | |
| parent | 2003-05-29 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-3f4876a5d19b1f783e4263395de810ec398ada91.tar.bz2 | |
Merger from rtems-4.6-branch
| -rw-r--r-- | cpukit/libcsupport/ChangeLog | 5 | ||||
| -rw-r--r-- | cpukit/libcsupport/Makefile.am | 7 | ||||
| -rw-r--r-- | cpukit/libcsupport/configure.ac | 11 | ||||
| -rw-r--r-- | cpukit/rtems/ChangeLog | 4 | ||||
| -rw-r--r-- | cpukit/rtems/include/rtems/rtems/types.h | 2 |
5 files changed, 23 insertions, 6 deletions
diff --git a/cpukit/libcsupport/ChangeLog b/cpukit/libcsupport/ChangeLog index ef90ce528a..087d9aa371 100644 --- a/cpukit/libcsupport/ChangeLog +++ b/cpukit/libcsupport/ChangeLog @@ -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: diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index b0b1a9f407..d9ea99770b 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -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) \ diff --git a/cpukit/libcsupport/configure.ac b/cpukit/libcsupport/configure.ac index 6bf9b79ebb..ec2d3e2430 100644 --- a/cpukit/libcsupport/configure.ac +++ b/cpukit/libcsupport/configure.ac @@ -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]) diff --git a/cpukit/rtems/ChangeLog b/cpukit/rtems/ChangeLog index 117d07a484..ce36f6c230 100644 --- a/cpukit/rtems/ChangeLog +++ b/cpukit/rtems/ChangeLog @@ -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: diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/rtems/include/rtems/rtems/types.h index 9fe77ee0f7..0d140a09bc 100644 --- a/cpukit/rtems/include/rtems/rtems/types.h +++ b/cpukit/rtems/include/rtems/rtems/types.h @@ -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; |