* symtab.c (operator_chars): Now static.

	* linespec.c (operator_chars): Don't declare.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0cc6c4b0a787d830bc5340d5cd8e24644391e597..a0b3d0b6db4bfc3b3ae9df9e9fc01350f4c5c8d7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-05  Tom Tromey  <tromey@redhat.com>
+
+       * symtab.c (operator_chars): Now static.
+       * linespec.c (operator_chars): Don't declare.
+
 2011-07-05  Thiago Jung Bauermann  <bauerman@br.ibm.com>
 
        * ui-out.h (ui_out_field_core_addr): Fix typo in comment.

diff --git a/gdb/linespec.c b/gdb/linespec.c
index 61f43b669f793840054746e0958406ba5aec075e..137ef9cf7e7a7c92f46cfacfdb55859195a49d91 100644 (file)
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -44,10 +44,6 @@
 #include <ctype.h>
 #include "cli/cli-utils.h"
 
-/* We share this one with symtab.c, but it is not exported widely.  */
-
-extern char *operator_chars (char *, char **);
-
 /* Prototypes for local functions.  */
 
 static void initialize_defaults (struct symtab **default_symtab,

diff --git a/gdb/symtab.c b/gdb/symtab.c
index 5ece679eafa93f13004deaa27166f1c8e66f589d..b792081af379ae11cc8e0ac6b8b2e905bc3b3c92 100644 (file)
--- a/gdb/symtab.c
+++ b/gdb/symtab.c
@@ -83,10 +83,6 @@ static void output_source_filename (const char *, int *);
 
 static int find_line_common (struct linetable *, int, int *);
 
-/* This one is used by linespec.c */
-
-char *operator_chars (char *p, char **end);
-
 static struct symbol *lookup_symbol_aux (const char *name,
                                         const struct block *block,
                                         const domain_enum domain,
@@ -2637,7 +2633,7 @@ skip_prologue_sal (struct symtab_and_line *sal)
    some legitimate operator text, return a pointer to the
    beginning of the substring of the operator text.
    Otherwise, return "".  */
-char *
+static char *
 operator_chars (char *p, char **end)
 {
   *end = "";