diff options
author | mike <mike@FreeBSD.org> | 2001-11-02 18:05:43 +0000 |
---|---|---|
committer | mike <mike@FreeBSD.org> | 2001-11-02 18:05:43 +0000 |
commit | 3df91ed4db51c6be4fddae3f156823f0bd491a4c (patch) | |
tree | 937d4736faa17a6c2aad33562ef0c9e5702ed854 /include | |
parent | a7cf9dee8f2c4a3ed37613951634d40b9fb66203 (diff) | |
download | FreeBSD-src-3df91ed4db51c6be4fddae3f156823f0bd491a4c.zip FreeBSD-src-3df91ed4db51c6be4fddae3f156823f0bd491a4c.tar.gz |
o Add new header <sys/stdint.h>.
o Make <stdint.h> a symbolic link to <sys/stdint.h>.
o Move most of <sys/inttypes.h> into <sys/stdint.h>, as per C99.
o Remove <sys/inttypes.h>.
o Adjust includes in sys/types.h and boot/efi/include/ia64/efibind.h
to reflect new location of integer types in <sys/stdint.h>.
o Remove previously symbolicly linked <inttypes.h>, instead create a
new file.
o Add MD headers <machine/_inttypes.h> from NetBSD.
o Include <sys/stdint.h> in <inttypes.h>, as required by C99; and
include <machine/_inttypes.h> in <inttypes.h>, to fill in the
remaining requirements for <inttypes.h>.
o Add additional integer types in <machine/ansi.h> and
<machine/limits.h> which are included via <sys/stdint.h>.
Partially obtain from: NetBSD
Tested on: alpha, i386
Discussed on: freebsd-standards@bostonradio.org
Reviewed by: bde, fenner, obrien, wollman
Diffstat (limited to 'include')
-rw-r--r-- | include/Makefile | 4 | ||||
-rw-r--r-- | include/inttypes.h | 54 |
2 files changed, 56 insertions, 2 deletions
diff --git a/include/Makefile b/include/Makefile index 1c4c867..f5010c8 100644 --- a/include/Makefile +++ b/include/Makefile @@ -12,7 +12,7 @@ FILES= a.out.h ar.h assert.h bitstring.h complex.h ctype.h db.h \ dirent.h disktab.h \ dlfcn.h elf.h elf-hints.h err.h fnmatch.h fstab.h \ fts.h glob.h grp.h \ - hesiod.h histedit.h ieeefp.h ifaddrs.h iso646.h langinfo.h \ + hesiod.h histedit.h ieeefp.h ifaddrs.h inttypes.h iso646.h langinfo.h \ libgen.h limits.h link.h locale.h malloc.h memory.h monetary.h mpool.h \ ndbm.h netconfig.h netdb.h nl_types.h nlist.h nsswitch.h objformat.h \ paths.h pthread.h pthread_np.h pwd.h \ @@ -37,7 +37,7 @@ PFILES= mqueue.h sched.h semaphore.h # aio.h # Only for default SHARED=copies case SFILES= soundcard.h joystick.h -LFILES= aio.h errno.h fcntl.h inttypes.h linker_set.h poll.h syslog.h \ +LFILES= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ termios.h ucontext.h LDIRS= cam net netatalk netatm netgraph netinet netinet6 \ diff --git a/include/inttypes.h b/include/inttypes.h new file mode 100644 index 0000000..f6b1922 --- /dev/null +++ b/include/inttypes.h @@ -0,0 +1,54 @@ +/*- + * Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _INTTYPES_H_ +#define _INTTYPES_H_ + +#include <machine/_inttypes.h> +#include <sys/stdint.h> + +#ifdef _BSD_WCHAR_T_ +typedef _BSD_WCHAR_T_ wchar_t; +#undef _BSD_WCHAR_T_ +#endif + +typedef struct { + intmax_t quot; /* Quotient. */ + intmax_t rem; /* Remainder. */ +} imaxdiv_t; + +intmax_t imaxabs(intmax_t); +imaxdiv_t imaxdiv(intmax_t, intmax_t); + +/* XXX: The following functions are missing the restrict type qualifier. */ +intmax_t strtoimax(const char *, char **, int); +uintmax_t strtoumax(const char *, char **, int); +intmax_t wcstoimax(const wchar_t *, wchar_t **, int); +uintmax_t wcstoumax(const wchar_t *, wchar_t **, int); + +#endif /* !_INTTYPES_H_ */ |