don't let bin2hex call strlen

[deliverable/binutils-gdb.git] / gdb / macroscope.h

diff --git a/gdb/macroscope.h b/gdb/macroscope.h
index 0408b52d78fcecf8b07f37f3d6259d0b04bcceed..4f46ba70a363c25f4622c713b2a8373eeded4f91 100644 (file)
--- a/gdb/macroscope.h
+++ b/gdb/macroscope.h
@@ -1,12 +1,12 @@
 /* Interface to functions for deciding which macros are currently in scope.
 /* Interface to functions for deciding which macros are currently in scope.

-   Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002-2014 Free Software Foundation, Inc.

    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Contributed by Red Hat, Inc.
 
    This file is part of GDB.
 
    This program 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 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -15,9 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #ifndef MACROSCOPE_H
 #define MACROSCOPE_H
 
 #ifndef MACROSCOPE_H
 #define MACROSCOPE_H


@@ -26,6 +24,9 @@
 #include "symtab.h"
 
 
 #include "symtab.h"
 
 

+/* The table of macros defined by the user.  */
+extern struct macro_table *macro_user_macros;
+

 /* All the information we need to decide which macro definitions are
    in scope: a source file (either a main source file or an
    #inclusion), and a line number in that file.  */
 /* All the information we need to decide which macro definitions are
    in scope: a source file (either a main source file or an
    #inclusion), and a line number in that file.  */


@@ -41,12 +42,18 @@ struct macro_scope {
 struct macro_scope *sal_macro_scope (struct symtab_and_line sal);
 
 
 struct macro_scope *sal_macro_scope (struct symtab_and_line sal);
 
 

+/* Return a `struct macro_scope' object representing just the
+   user-defined macros.  The result is allocated using xmalloc; the
+   caller is responsible for freeing it.  */
+struct macro_scope *user_macro_scope (void);
+

 /* Return a `struct macro_scope' object describing the scope the `macro
    expand' and `macro expand-once' commands should use for looking up
    macros.  If we have a selected frame, this is the source location of
    its PC; otherwise, this is the last listing position.
 
 /* Return a `struct macro_scope' object describing the scope the `macro
    expand' and `macro expand-once' commands should use for looking up
    macros.  If we have a selected frame, this is the source location of
    its PC; otherwise, this is the last listing position.
 

-   If we have no macro information for the current location, return zero.
+   If we have no macro information for the current location, return
+   the user macro scope.

 
    The object returned is allocated using xmalloc; the caller is
    responsible for freeing it.  */
 
    The object returned is allocated using xmalloc; the caller is
    responsible for freeing it.  */