Mercurial > hg > octave-kai > gnulib-hg
changeset 5219:fcff9e1a6e22
New module 'stdint'.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Wed, 08 Sep 2004 12:43:11 +0000 |
parents | f96c64693f86 |
children | c900cc84cf3f |
files | ChangeLog MODULES.html.sh lib/ChangeLog lib/stdint_.h m4/ChangeLog m4/stdint.m4 modules/stdint |
diffstat | 7 files changed, 383 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-09-08 Bruno Haible <bruno@clisp.org> + Oskar Liljeblad <oskar@osk.mine.nu> + + * modules/stdint: New file. + * MODULES.html.sh (Support for systems lacking ISO C 99): Add stdint. + 2004-09-08 Oskar Liljeblad <oskar@osk.mine.nu> * modules/xvasprintf: New file.
--- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1640,6 +1640,16 @@ func_module stdbool func_end_table + element="Integer types and values <stdint.h>" + element=`printf "%s" "$element" | sed -e "$sed_lt" -e "$sed_gt"` + func_section_wrap isoc_sup_stdint + func_wrap H3 + func_echo "$element" + + func_begin_table + func_module stdint + func_end_table + element="Numeric conversion functions <stdlib.h>" element=`printf "%s" "$element" | sed -e "$sed_lt" -e "$sed_gt"` func_section_wrap isoc_sup_stdlib_conv
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2004-09-08 Bruno Haible <bruno@clisp.org> + + * stdint_.h.in: New file, taken from GNU clisp. + 2004-09-08 Oskar Liljeblad <oskar@osk.mine.nu> * xvasprintf.h: New file.
new file mode 100644 --- /dev/null +++ b/lib/stdint_.h @@ -0,0 +1,267 @@ +/* Copyright (C) 2001-2002, 2004 Free Software Foundation, Inc. + Written by Bruno Haible, Sam Steingold, Peter Burwood. + This file is part of gnulib. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _STDINT_H +#define _STDINT_H + +/* + * ISO C 99 <stdint.h> for platforms that lack it. + * <http://www.opengroup.org/onlinepubs/007904975/basedefs/stdint.h.html> + */ + +/* Get wchar_t, WCHAR_MIN, WCHAR_MAX. */ +#include <stddef.h> +/* Get CHAR_BIT, LONG_MIN, LONG_MAX, ULONG_MAX. */ +#include <limits.h> + +/* Get those types that are already defined in other system include files. */ +#if defined(__FreeBSD__) +# include <sys/inttypes.h> +#endif +#if defined(__sun) && HAVE_SYS_INTTYPES_H +# include <sys/inttypes.h> + /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and + the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX. + But note that <sys/int_types.h> contains only the type definitions! */ +# define HAVE_SYSTEM_INTTYPES +#endif +#if (defined(__hpux) || defined(_AIX)) && HAVE_INTTYPES_H +# include <inttypes.h> + /* HP-UX 10 <inttypes.h> has nearly everything, except UINT_LEAST8_MAX, + UINT_FAST8_MAX, PTRDIFF_MIN, PTRDIFF_MAX. */ + /* AIX 4 <inttypes.h> has nearly everything, except INTPTR_MIN, INTPTR_MAX, + UINTPTR_MAX, PTRDIFF_MIN, PTRDIFF_MAX. */ +# define HAVE_SYSTEM_INTTYPES +#endif +#if !(defined(UNIX_CYGWIN32) && defined(__BIT_TYPES_DEFINED__)) +# define NEED_SIGNED_INT_TYPES +#endif + +#if !defined(HAVE_SYSTEM_INTTYPES) + +/* 7.18.1.1. Exact-width integer types */ + +#if !defined(__FreeBSD__) + +#ifdef NEED_SIGNED_INT_TYPES +typedef signed char int8_t; +#endif +typedef unsigned char uint8_t; + +#ifdef NEED_SIGNED_INT_TYPES +typedef short int16_t; +#endif +typedef unsigned short uint16_t; + +#ifdef NEED_SIGNED_INT_TYPES +typedef int int32_t; +#endif +typedef unsigned int uint32_t; + +#if @HAVE_LONG_64BIT@ +#ifdef NEED_SIGNED_INT_TYPES +typedef long int64_t; +#endif +typedef unsigned long uint64_t; +#elif @HAVE_LONGLONG_64BIT@ +#ifdef NEED_SIGNED_INT_TYPES +typedef long long int64_t; +#endif +typedef unsigned long long uint64_t; +#endif + +#endif /* !FreeBSD */ + +/* 7.18.1.2. Minimum-width integer types */ + +typedef int8_t int_least8_t; +typedef uint8_t uint_least8_t; +typedef int16_t int_least16_t; +typedef uint16_t uint_least16_t; +typedef int32_t int_least32_t; +typedef uint32_t uint_least32_t; +#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@ +typedef int64_t int_least64_t; +typedef uint64_t uint_least64_t; +#endif + +/* 7.18.1.3. Fastest minimum-width integer types */ + +typedef int32_t int_fast8_t; +typedef uint32_t uint_fast8_t; +typedef int32_t int_fast16_t; +typedef uint32_t uint_fast16_t; +typedef int32_t int_fast32_t; +typedef uint32_t uint_fast32_t; +#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@ +typedef int64_t int_fast64_t; +typedef uint64_t uint_fast64_t; +#endif + +/* 7.18.1.4. Integer types capable of holding object pointers */ + +#if !defined(__FreeBSD__) + +/* On some platforms (like IRIX6 MIPS with -n32) sizeof(void*) < sizeof(long), + but this doesn't matter here. */ +typedef long intptr_t; +typedef unsigned long uintptr_t; + +#endif /* !FreeBSD */ + +/* 7.18.1.5. Greatest-width integer types */ + +#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@ +typedef int64_t intmax_t; +typedef uint64_t uintmax_t; +#else +typedef int32_t intmax_t; +typedef uint32_t uintmax_t; +#endif + +/* 7.18.2. Limits of specified-width integer types */ + +#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) + +/* 7.18.2.1. Limits of exact-width integer types */ + +#define INT8_MIN -128 +#define INT8_MAX 127 +#define UINT8_MAX 255U +#define INT16_MIN -32768 +#define INT16_MAX 32767 +#define UINT16_MAX 65535U +#define INT32_MIN (~INT32_MAX) +#define INT32_MAX 2147483647 +#define UINT32_MAX 4294967295U +#if @HAVE_LONG_64BIT@ +#define INT64_MIN (~INT64_MIN) +#define INT64_MAX 9223372036854775807L +#define UINT64_MAX 18446744073709551615UL +#elif @HAVE_LONGLONG_64BIT@ +#define INT64_MIN (~INT64_MIN) +#define INT64_MAX 9223372036854775807LL +#define UINT64_MAX 18446744073709551615ULL +#endif + +/* 7.18.2.2. Limits of minimum-width integer types */ + +#define INT_LEAST8_MIN INT8_MIN +#define INT_LEAST8_MAX INT8_MAX +#define UINT_LEAST8_MAX UINT8_MAX +#define INT_LEAST16_MIN INT16_MIN +#define INT_LEAST16_MAX INT16_MAX +#define UINT_LEAST16_MAX UINT16_MAX +#define INT_LEAST32_MIN INT32_MIN +#define INT_LEAST32_MAX INT32_MAX +#define UINT_LEAST32_MAX UINT32_MAX +#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@ +#define INT_LEAST64_MIN INT64_MIN +#define INT_LEAST64_MAX INT64_MAX +#define UINT_LEAST64_MAX UINT64_MAX +#endif + +/* 7.18.2.3. Limits of fastest minimum-width integer types */ + +#define INT_FAST8_MIN INT32_MIN +#define INT_FAST8_MAX INT32_MAX +#define UINT_FAST8_MAX UINT32_MAX +#define INT_FAST16_MIN INT32_MIN +#define INT_FAST16_MAX INT32_MAX +#define UINT_FAST16_MAX UINT32_MAX +#define INT_FAST32_MIN INT32_MIN +#define INT_FAST32_MAX INT32_MAX +#define UINT_FAST32_MAX UINT32_MAX +#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@ +#define INT_FAST64_MIN INT64_MIN +#define INT_FAST64_MAX INT64_MAX +#define UINT_FAST64_MAX UINT64_MAX +#endif + +/* 7.18.2.4. Limits of integer types capable of holding object pointers */ + +#define INTPTR_MIN LONG_MIN +#define INTPTR_MAX LONG_MAX +#define UINTPTR_MAX ULONG_MAX + +/* 7.18.2.5. Limits of greatest-width integer types */ + +#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@ +#define INTMAX_MIN INT64_MIN +#define INTMAX_MAX INT64_MAX +#define UINTMAX_MAX UINT64_MAX +#else +#define INTMAX_MIN INT32_MIN +#define INTMAX_MAX INT32_MAX +#define UINTMAX_MAX UINT32_MAX +#endif + +/* 7.18.3. Limits of other integer types */ + +#define PTRDIFF_MIN (~(ptrdiff_t)0 << (sizeof(ptrdiff_t)*CHAR_BIT-1)) +#define PTRDIFF_MAX (~PTRDIFF_MIN) + +/* This may be wrong... */ +#define SIG_ATOMIC_MIN 0 +#define SIG_ATOMIC_MAX 127 + +#define SIZE_MAX (~(size_t)0) + +/* wchar_t limits already defined in <stddef.h>. */ +/* wint_t limits already defined in <wchar.h>. */ + +#endif + +/* 7.18.4. Macros for integer constants */ + +#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) + +/* 7.18.4.1. Macros for minimum-width integer constants */ + +#define INT8_C(x) x +#define UINT8_C(x) x##U +#define INT16_C(x) x +#define UINT16_C(x) x##U +#define INT32_C(x) x +#define UINT32_C(x) x##U +#if @HAVE_LONG_64BIT@ +#define INT64_C(x) x##L +#define UINT64_C(x) x##UL +#elif @HAVE_LONGLONG_64BIT@ +#define INT64_C(x) x##LL +#define UINT64_C(x) x##ULL +#endif + +/* 7.18.4.2. Macros for greatest-width integer constants */ + +#if @HAVE_LONG_64BIT@ +#define INTMAX_C(x) x##L +#define UINTMAX_C(x) x##UL +#elif @HAVE_LONGLONG_64BIT@ +#define INTMAX_C(x) x##LL +#define UINTMAX_C(x) x##ULL +#else +#define INTMAX_C(x) x +#define UINTMAX_C(x) x##U +#endif + +#endif + +#endif /* !HAVE_SYSTEM_INTTYPES */ + +#endif /* _STDINT_H */
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2004-09-08 Bruno Haible <bruno@clisp.org> + + * stdint.m4: New file, taken from GNU clisp with modifications. + 2004-08-19 Paul Eggert <eggert@cs.ucla.edu> * userspec.m4 (gl_USERSPEC): Don't require AC_FUNC_ALLOCA.
new file mode 100644 --- /dev/null +++ b/m4/stdint.m4 @@ -0,0 +1,60 @@ +# stdint.m4 serial 2 +dnl Copyright (C) 2001-2002, 2004 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. +dnl Test whether <stdint.h> is supported or must be substituted. + +AC_DEFUN([gl_STDINT_H], +[dnl Check for <inttypes.h>. +AC_REQUIRE([gt_HEADER_INTTYPES_H]) +dnl Check for <sys/inttypes.h>. +AC_CHECK_HEADERS([sys/inttypes.h]) + +AC_MSG_CHECKING([for stdint.h]) +AC_CACHE_VAL(gl_cv_header_stdint_h, [ + AC_TRY_COMPILE([#include <stdint.h>], [], + gl_cv_header_stdint_h=yes, gl_cv_header_stdint_h=no)]) +AC_MSG_RESULT([$gl_cv_header_stdint_h]) +if test $gl_cv_header_stdint_h = yes; then + AC_DEFINE(HAVE_STDINT_H, 1, + [Define if you have a working <stdint.h> header file.]) + STDINT_H='' +else + STDINT_H='stdint.h' + + dnl Is long == int64_t ? + AC_CACHE_CHECK([whether 'long' is 64 bit wide], gl_cv_long_bitsize_64, [ + AC_TRY_COMPILE([ +#define POW63 ((((((long) 1 << 15) << 15) << 15) << 15) << 3) +#define POW64 ((((((long) 1 << 15) << 15) << 15) << 15) << 4) +typedef int array [2 * (POW63 != 0 && POW64 == 0) - 1]; +], , gl_cv_long_bitsize_64=yes, gl_cv_long_bitsize_64=no)]) + if test $gl_cv_long_bitsize_64 = yes; then + HAVE_LONG_64BIT=1 + else + HAVE_LONG_64BIT=0 + fi + AC_SUBST(HAVE_LONG_64BIT) + + dnl Is long long == int64_t ? + AC_CACHE_CHECK([whether 'long long' is 64 bit wide], gl_cv_longlong_bitsize_64, [ + AC_TRY_COMPILE([ +#define POW63 ((((((long long) 1 << 15) << 15) << 15) << 15) << 3) +#define POW64 ((((((long long) 1 << 15) << 15) << 15) << 15) << 4) +typedef int array [2 * (POW63 != 0 && POW64 == 0) - 1]; +], , gl_cv_longlong_bitsize_64=yes, gl_cv_longlong_bitsize_64=no)]) + if test $gl_cv_longlong_bitsize_64 = yes; then + HAVE_LONGLONG_64BIT=1 + else + HAVE_LONGLONG_64BIT=0 + fi + AC_SUBST(HAVE_LONGLONG_64BIT) + +fi +AC_SUBST(STDINT_H) +])
new file mode 100644 --- /dev/null +++ b/modules/stdint @@ -0,0 +1,32 @@ +Description: +An <stdint.h> that nearly conforms to C99. +(Nearly: {uint,int}_{fast,least}{8,16,32,64}_t may not correspond +to the fastest and smallest types available on the system.) + +Files: +lib/stdint_.h +m4/stdint.m4 +m4/inttypes.m4 + +Depends-on: + +configure.ac: +gl_STDINT_H + +Makefile.am: +BUILT_SOURCES += $(STDINT_H) +EXTRA_DIST += stdint_.h + +# We need the following in order to create an <stdint.h> when the system +# doesn't have one that works with the given compiler. +all-local $(lib_OBJECTS): $(STDINT_H) +stdint.h: stdint_.h + sed -e 's/@''HAVE_LONG_64BIT''@/$(HAVE_LONG_64BIT)/g;s/@''HAVE_LONGLONG_64BIT@/$(HAVE_LONGLONG_64BIT)/g' < $(srcdir)/stdint_.h > $@-t + mv $@-t $@ +MOSTLYCLEANFILES += stdint.h stdint.h-t + +Include: +#include <stdint.h> + +Maintainer: +all