libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-28 03:27:46 +08:00
Code Issues Projects Releases Wiki Activity

merge from gcc

Browse Source
This commit is contained in:
DJ Delorie 2012-04-10 17:07:28 +00:00
parent 1036f9f1bf
commit a281df5589
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/ChangeLog
View File

@ -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> 2012-04-09 Roland McGrath <mcgrathr@google.com>
* bfdlink.h (struct bfd_link_info): Add new member user_phdrs. * bfdlink.h (struct bfd_link_info): Add new member user_phdrs.

19
include/splay-tree.h
View File

@ -37,18 +37,11 @@ extern "C" {
#include "ansidecl.h" #include "ansidecl.h"
#ifndef _WIN64 #ifdef HAVE_STDINT_H
typedef unsigned long int libi_uhostptr_t; #include <stdint.h>
typedef long int libi_shostptr_t;
#else
#ifdef __GNUC__
__extension__
#endif #endif
typedef unsigned long long libi_uhostptr_t; #ifdef HAVE_INTTYPES_H
#ifdef __GNUC__ #include <inttypes.h>
__extension__
#endif
typedef long long libi_shostptr_t;
#endif #endif
#ifndef GTY #ifndef GTY
@ -59,8 +52,8 @@ extern "C" {
these types, if necessary. These types should be sufficiently wide these types, if necessary. These types should be sufficiently wide
that any pointer or scalar can be cast to these types, and then that any pointer or scalar can be cast to these types, and then
cast back, without loss of precision. */ cast back, without loss of precision. */
typedef libi_uhostptr_t splay_tree_key; typedef uintptr_t splay_tree_key;
typedef libi_uhostptr_t splay_tree_value; typedef uintptr_t splay_tree_value;
/* Forward declaration for a node in the tree. */ /* Forward declaration for a node in the tree. */
typedef struct splay_tree_node_s *splay_tree_node; typedef struct splay_tree_node_s *splay_tree_node;