diff options
| author | Tristan Gingold <gingold@adacore.com> | 2012-04-10 08:32:23 +0000 |
|---|---|---|
| committer | Tristan Gingold <gingold@adacore.com> | 2012-04-10 08:32:23 +0000 |
| commit | e9280c43578e747e67a9427b691132a3fe7e90e3 (patch) | |
| tree | 5231c973389ab0e251d4209d2828824ec5074bc8 | |
| parent | b985b4e1ab52662c8e428df62a3f34324736ecb9 (diff) | |
gcc/
2012-04-10 Tristan Gingold <gingold@adacore.com>
* gengtype.c (main): Make uintptr_t a known type.
include/
2012-04-10 Tristan Gingold <gingold@adacore.com>
* splay-tree.h: Conditionnaly includes stdint.h and inttypes.h
(libi_uhostptr_t, libi_shostptr_t): Remove, replaced by uintptr_t.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@186269 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/gengtype.c | 1 | ||||
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/splay-tree.h | 19 |
4 files changed, 16 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3a1819dfff3..2e39f782f60 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2012-04-10 Tristan Gingold <gingold@adacore.com> + + * gengtype.c (main): Make uintptr_t a known type. + 2012-04-10 Richard Guenther <rguenther@suse.de> * tree-pass.h (tree_lowering_passes): Remove. diff --git a/gcc/gengtype.c b/gcc/gengtype.c index 7450eebac4f..fa453929814 100644 --- a/gcc/gengtype.c +++ b/gcc/gengtype.c @@ -4976,6 +4976,7 @@ main (int argc, char **argv) POS_HERE (do_scalar_typedef ("double_int", &pos)); POS_HERE (do_scalar_typedef ("uint64_t", &pos)); POS_HERE (do_scalar_typedef ("uint8", &pos)); + POS_HERE (do_scalar_typedef ("uintptr_t", &pos)); POS_HERE (do_scalar_typedef ("jword", &pos)); POS_HERE (do_scalar_typedef ("JCF_u2", &pos)); POS_HERE (do_scalar_typedef ("void", &pos)); diff --git a/include/ChangeLog b/include/ChangeLog index b9e81e31f40..4e0ee9a0c1c 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2012-04-10 Tristan Gingold <gingold@adacore.com> + + * splay-tree.h: Conditionnaly includes stdint.h and inttypes.h + (libi_uhostptr_t, libi_shostptr_t): Remove, replaced by uintptr_t. + 2012-01-26 Cary Coutant <ccoutant@google.com> * dwarf2.h (enum dwarf_form): Add Fission extensions. diff --git a/include/splay-tree.h b/include/splay-tree.h index 480b2c43e7d..a26135a099d 100644 --- a/include/splay-tree.h +++ b/include/splay-tree.h @@ -37,18 +37,11 @@ extern "C" { #include "ansidecl.h" -#ifndef _WIN64 - typedef unsigned long int libi_uhostptr_t; - typedef long int libi_shostptr_t; -#else -#ifdef __GNUC__ - __extension__ +#ifdef HAVE_STDINT_H +#include <stdint.h> #endif - typedef unsigned long long libi_uhostptr_t; -#ifdef __GNUC__ - __extension__ -#endif - typedef long long libi_shostptr_t; +#ifdef HAVE_INTTYPES_H +#include <inttypes.h> #endif #ifndef GTY @@ -59,8 +52,8 @@ extern "C" { these types, if necessary. These types should be sufficiently wide that any pointer or scalar can be cast to these types, and then cast back, without loss of precision. */ -typedef libi_uhostptr_t splay_tree_key; -typedef libi_uhostptr_t splay_tree_value; +typedef uintptr_t splay_tree_key; +typedef uintptr_t splay_tree_value; /* Forward declaration for a node in the tree. */ typedef struct splay_tree_node_s *splay_tree_node; |