From 007425f1be975b0f98ef5714fd5ee8a16eb9715c Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 25 Jun 2002 01:03:52 +0000 Subject: [PATCH] merge from gcc --- include/ChangeLog | 9 +++++++++ include/demangle.h | 4 ++-- include/fibheap.h | 4 ++-- include/hashtab.h | 4 ++-- include/partition.h | 4 ++-- include/sort.h | 4 ++-- include/splay-tree.h | 4 ++-- 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/include/ChangeLog b/include/ChangeLog index 05a3981116f..32628bb8bd5 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,12 @@ +2002-06-25 Alan Modra + + * demangle.h: #include "ansidecl.h" rather than #include . + * fibheap.h: Likewise. + * hashtab.h: Likewise. + * partition.h: Likewise. + * sort.h: Likewise. + * splay-tree.h: Likewise. + 2002-06-24 Alan Modra * libiberty.h (basename): Don't declare if HAVE_DECL_BASENAME. diff --git a/include/demangle.h b/include/demangle.h index ad0569a0d57..21e9dd33820 100644 --- a/include/demangle.h +++ b/include/demangle.h @@ -1,5 +1,5 @@ /* Defs for interface to demanglers. - Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001 + Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -21,7 +21,7 @@ #if !defined (DEMANGLE_H) #define DEMANGLE_H -#include +#include "ansidecl.h" /* Options passed to cplus_demangle (in 2nd parameter). */ diff --git a/include/fibheap.h b/include/fibheap.h index d109e4ad163..fc37f9ef635 100644 --- a/include/fibheap.h +++ b/include/fibheap.h @@ -1,5 +1,5 @@ /* A Fibonacci heap datatype. - Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by Daniel Berlin (dan@cgsoftware.com). This file is part of GCC. @@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA. */ #ifndef _FIBHEAP_H_ #define _FIBHEAP_H_ -#include +#include "ansidecl.h" typedef long fibheapkey_t; diff --git a/include/hashtab.h b/include/hashtab.h index 7fb31e48c4e..be866b51ee6 100644 --- a/include/hashtab.h +++ b/include/hashtab.h @@ -1,5 +1,5 @@ /* An expandable hash tables datatype. - Copyright (C) 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. Contributed by Vladimir Makarov (vmakarov@cygnus.com). This program is free software; you can redistribute it and/or modify @@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ extern "C" { #endif /* __cplusplus */ -#include +#include "ansidecl.h" #ifndef GTY #define GTY(X) diff --git a/include/partition.h b/include/partition.h index 851422a957a..885a79b4ba3 100644 --- a/include/partition.h +++ b/include/partition.h @@ -1,5 +1,5 @@ /* List implementation of a partition of consecutive integers. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. Contributed by CodeSourcery, LLC. This file is part of GCC. @@ -40,7 +40,7 @@ extern "C" { #endif /* __cplusplus */ -#include +#include "ansidecl.h" #include struct partition_elem diff --git a/include/sort.h b/include/sort.h index b974059ddfa..3f3a92f18f0 100644 --- a/include/sort.h +++ b/include/sort.h @@ -1,5 +1,5 @@ /* Sorting algorithms. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2002 Free Software Foundation, Inc. Contributed by Mark Mitchell . This file is part of GCC. @@ -31,7 +31,7 @@ Boston, MA 02111-1307, USA. */ extern "C" { #endif /* __cplusplus */ -#include +#include "ansidecl.h" /* Sort an array of pointers. */ diff --git a/include/splay-tree.h b/include/splay-tree.h index 4b7a7bf8c2c..23f7ac69d42 100644 --- a/include/splay-tree.h +++ b/include/splay-tree.h @@ -1,5 +1,5 @@ /* A splay-tree datatype. - Copyright 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2002 Free Software Foundation, Inc. Contributed by Mark Mitchell (mark@markmitchell.com). This file is part of GCC. @@ -34,7 +34,7 @@ Boston, MA 02111-1307, USA. */ extern "C" { #endif /* __cplusplus */ -#include +#include "ansidecl.h" /* Use typedefs for the key and data types to facilitate changing these types, if necessary. These types should be sufficiently wide -- 2.30.2