summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorgingold <gingold@138bc75d-0d04-0410-961f-82ee72b054a4>2012-04-10 08:32:23 +0000
committergingold <gingold@138bc75d-0d04-0410-961f-82ee72b054a4>2012-04-10 08:32:23 +0000
commitee0af6e08536390531eb0bcbbb7978721297b19f (patch)
tree5231c973389ab0e251d4209d2828824ec5074bc8 /include
parent47199071a049d529a66ee06128853fd7774846ef (diff)
downloadgcc-ee0af6e08536390531eb0bcbbb7978721297b19f.tar.gz
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: svn+ssh://gcc.gnu.org/svn/gcc/trunk@186269 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'include')
-rw-r--r--include/ChangeLog5
-rw-r--r--include/splay-tree.h19
2 files changed, 11 insertions, 13 deletions
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;