Backported from mainline

[pf3gnuchains/gcc-fork.git] / include / splay-tree.h

diff --git a/include/splay-tree.h b/include/splay-tree.h
index 67da6b2..480b2c4 100644 (file)
--- a/include/splay-tree.h
+++ b/include/splay-tree.h
@@ -37,27 +37,30 @@ extern "C" {
 
 #include "ansidecl.h"
 
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
+#ifndef _WIN64
+  typedef unsigned long int libi_uhostptr_t;
+  typedef long int libi_shostptr_t;
+#else
+#ifdef __GNUC__
+  __extension__
 #endif
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
+  typedef unsigned long long libi_uhostptr_t;
+#ifdef __GNUC__
+  __extension__
 #endif
-#if !defined HAVE_STDINT_H && !defined HAVE_INTTYPES_H
-  typedef unsigned long int uintptr_t;
+  typedef long long libi_shostptr_t;
 #endif
-  
+
 #ifndef GTY
 #define GTY(X)
 #endif
 
-  
 /* Use typedefs for the key and data types to facilitate changing
    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 uintptr_t splay_tree_key;
-typedef uintptr_t splay_tree_value;
+typedef libi_uhostptr_t splay_tree_key;
+typedef libi_uhostptr_t splay_tree_value;
 
 /* Forward declaration for a node in the tree.  */
 typedef struct splay_tree_node_s *splay_tree_node;