X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=include%2Fdyn-string.h;h=315f63fabc8f96864154410749fbd22cf3d164c4;hb=41ae02c9eaedd88a26c7772a54e50a03ee129f7c;hp=3e2213e5bc6fc1e0e5e223f6b2e2cbc33157b373;hpb=27e232885db363fb545fd2f450e72d929e59b8f6;p=deliverable%2Fbinutils-gdb.git

diff --git a/include/dyn-string.h b/include/dyn-string.h
index 3e2213e5bc..315f63fabc 100644
--- a/include/dyn-string.h
+++ b/include/dyn-string.h
@@ -2,20 +2,20 @@
    Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
    Contributed by Mark Mitchell (mark@markmitchell.com).
 
-This file is part of GNU CC.
+This file is part of GCC.
    
-GNU CC is free software; you can redistribute it and/or modify
+GCC is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
-GNU CC is distributed in the hope that it will be useful,
+GCC is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
+along with GCC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
@@ -40,25 +40,53 @@ typedef struct dyn_string
   (strcmp ((DS1)->s, (DS2)->s))
 
 
-extern void dyn_string_init             PARAMS ((struct dyn_string *, int));
+/* dyn_string functions are used in the demangling implementation
+   included in the G++ runtime library.  To prevent collisions with
+   names in user programs, the functions that are used in the
+   demangler are given implementation-reserved names.  */
+
+#ifdef IN_LIBGCC2
+
+#define dyn_string_init                 __cxa_dyn_string_init
+#define dyn_string_new                  __cxa_dyn_string_new
+#define dyn_string_delete               __cxa_dyn_string_delete
+#define dyn_string_release              __cxa_dyn_string_release
+#define dyn_string_resize               __cxa_dyn_string_resize
+#define dyn_string_clear                __cxa_dyn_string_clear
+#define dyn_string_copy                 __cxa_dyn_string_copy
+#define dyn_string_copy_cstr            __cxa_dyn_string_copy_cstr
+#define dyn_string_prepend              __cxa_dyn_string_prepend
+#define dyn_string_prepend_cstr         __cxa_dyn_string_prepend_cstr
+#define dyn_string_insert               __cxa_dyn_string_insert
+#define dyn_string_insert_cstr          __cxa_dyn_string_insert_cstr
+#define dyn_string_insert_char          __cxa_dyn_string_insert_char
+#define dyn_string_append               __cxa_dyn_string_append
+#define dyn_string_append_cstr          __cxa_dyn_string_append_cstr
+#define dyn_string_append_char          __cxa_dyn_string_append_char
+#define dyn_string_substring            __cxa_dyn_string_substring
+#define dyn_string_eq                   __cxa_dyn_string_eq
+
+#endif /* IN_LIBGCC2 */
+
+
+extern int dyn_string_init              PARAMS ((struct dyn_string *, int));
 extern dyn_string_t dyn_string_new      PARAMS ((int));
 extern void dyn_string_delete           PARAMS ((dyn_string_t));
 extern char *dyn_string_release         PARAMS ((dyn_string_t));
 extern dyn_string_t dyn_string_resize   PARAMS ((dyn_string_t, int));
 extern void dyn_string_clear            PARAMS ((dyn_string_t));
-extern void dyn_string_copy             PARAMS ((dyn_string_t, dyn_string_t));
-extern void dyn_string_copy_cstr        PARAMS ((dyn_string_t, const char *));
-extern void dyn_string_prepend          PARAMS ((dyn_string_t, dyn_string_t));
-extern void dyn_string_prepend_cstr     PARAMS ((dyn_string_t, const char *));
-extern void dyn_string_insert           PARAMS ((dyn_string_t, int,
+extern int dyn_string_copy              PARAMS ((dyn_string_t, dyn_string_t));
+extern int dyn_string_copy_cstr         PARAMS ((dyn_string_t, const char *));
+extern int dyn_string_prepend           PARAMS ((dyn_string_t, dyn_string_t));
+extern int dyn_string_prepend_cstr      PARAMS ((dyn_string_t, const char *));
+extern int dyn_string_insert            PARAMS ((dyn_string_t, int,
 						 dyn_string_t));
-extern void dyn_string_insert_cstr      PARAMS ((dyn_string_t, int,
+extern int dyn_string_insert_cstr       PARAMS ((dyn_string_t, int,
 						 const char *));
-extern dyn_string_t dyn_string_append   PARAMS ((dyn_string_t, dyn_string_t));
-extern dyn_string_t dyn_string_append_cstr   
-                                        PARAMS ((dyn_string_t, const char *));
-extern dyn_string_t dyn_string_append_char
-                                        PARAMS ((dyn_string_t, int));
-extern void dyn_string_substring        PARAMS ((dyn_string_t, 
+extern int dyn_string_insert_char       PARAMS ((dyn_string_t, int, int));
+extern int dyn_string_append            PARAMS ((dyn_string_t, dyn_string_t));
+extern int dyn_string_append_cstr       PARAMS ((dyn_string_t, const char *));
+extern int dyn_string_append_char       PARAMS ((dyn_string_t, int));
+extern int dyn_string_substring         PARAMS ((dyn_string_t, 
 						 dyn_string_t, int, int));
 extern int dyn_string_eq                PARAMS ((dyn_string_t, dyn_string_t));