merge from gcc

This commit is contained in:
DJ Delorie 2007-07-13 18:23:23 +00:00
parent 979dc3bca9
commit 31a55cbe03

View File

@ -37,11 +37,11 @@ extern "C" {
#include "ansidecl.h" #include "ansidecl.h"
#ifndef _WIN64 #ifndef _WIN64
typedef unsigned long int libi_uhostptr_t; typedef unsigned long int libi_uhostptr_t;
typedef long int libi_shostptr_t; typedef long int libi_shostptr_t;
#else #else
typedef unsigned long long libi_uhostptr_t; typedef unsigned long long libi_uhostptr_t;
typedef long long libi_shostptr_t; typedef long long libi_shostptr_t;
#endif #endif
#ifndef GTY #ifndef GTY
@ -118,8 +118,8 @@ struct splay_tree_s GTY(())
splay_tree_allocate_fn allocate; splay_tree_allocate_fn allocate;
splay_tree_deallocate_fn deallocate; splay_tree_deallocate_fn deallocate;
void * GTY((skip)) allocate_data; void * GTY((skip)) allocate_data;
}; };
typedef struct splay_tree_s *splay_tree; typedef struct splay_tree_s *splay_tree;
extern splay_tree splay_tree_new (splay_tree_compare_fn, extern splay_tree splay_tree_new (splay_tree_compare_fn,