diff options
| author | DJ Delorie <dj@redhat.com> | 2012-04-10 17:07:35 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2012-04-10 17:07:35 +0000 |
| commit | b3641a6eb9d85ff72c04f0ac8cf140c73e47aa94 (patch) | |
| tree | f550ac103a3bdbf60f410fce463379436838e1d5 /include | |
| parent | 9a82b8ff879eb1e69e4050c2d79f299443a2b613 (diff) | |
| download | gdb-b3641a6eb9d85ff72c04f0ac8cf140c73e47aa94.zip gdb-b3641a6eb9d85ff72c04f0ac8cf140c73e47aa94.tar.gz gdb-b3641a6eb9d85ff72c04f0ac8cf140c73e47aa94.tar.bz2 | |
merge from gcc
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/splay-tree.h | 19 |
2 files changed, 11 insertions, 13 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 495c0c8..e14f707 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-04-09 Roland McGrath <mcgrathr@google.com> * bfdlink.h (struct bfd_link_info): Add new member user_phdrs. diff --git a/include/splay-tree.h b/include/splay-tree.h index 480b2c43..a26135a 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; |