2003-11-25 Michael Snyder <msnyder@redhat.com>

[deliverable/binutils-gdb.git] / include / demangle.h

diff --git a/include/demangle.h b/include/demangle.h
index cbe28041301ddfb7c57d41f684741d79dd6e2d29..bff266931c81b6f5d73e374f32ec5627304a96d0 100644 (file)
--- 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,11 @@
 #if !defined (DEMANGLE_H)
 #define DEMANGLE_H
 
-#include <ansidecl.h>
+#include "ansidecl.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 /* Options passed to cplus_demangle (in 2nd parameter). */
 
@@ -29,6 +33,8 @@
 #define DMGL_PARAMS     (1 << 0)       /* Include function args */
 #define DMGL_ANSI       (1 << 1)       /* Include const, volatile, etc */
 #define DMGL_JAVA       (1 << 2)       /* Demangle as Java rather than C++. */
+#define DMGL_VERBOSE    (1 << 3)       /* Include implementation details.  */
+#define DMGL_TYPES      (1 << 4)       /* Also try to demangle type encodings.  */
 
 #define DMGL_AUTO       (1 << 8)
 #define DMGL_GNU        (1 << 9)
@@ -125,12 +131,7 @@ cplus_demangle_name_to_style PARAMS ((const char *name));
 
 /* V3 ABI demangling entry points, defined in cp-demangle.c.  */
 extern char*
-cplus_demangle_v3 PARAMS ((const char* mangled));
-
-/* V3 ABI demangling entry points, defined in cp-demangle.c. Also
-   demagle types. */
-extern char*
-cplus_demangle_v3_type PARAMS ((const char* mangled));
+cplus_demangle_v3 PARAMS ((const char* mangled, int options));
 
 extern char*
 java_demangle_v3 PARAMS ((const char* mangled));
@@ -163,4 +164,8 @@ enum gnu_v3_dtor_kinds {
 extern enum gnu_v3_dtor_kinds
        is_gnu_v3_mangled_dtor PARAMS ((const char *name));
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 #endif /* DEMANGLE_H */