merge from gcc
This commit is contained in:
parent
1036f9f1bf
commit
a281df5589
|
@ -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.
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue