From: Roger Sayle <roger@eyesopen.com>
Date: Mon, 7 Jun 2004 02:10:55 +0000 (+0000)
Subject: tree.h (lvalue_or_else): Delete function prototype.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=25a1a39e0d97ba879795de3fafd3115ba06a514f;p=gcc.git

tree.h (lvalue_or_else): Delete function prototype.


	* tree.h (lvalue_or_else): Delete function prototype.
	* c-typeck.c (lvalue_or_else): Make static.  Add static prototype.
	* cp/cp-tree.h (lvalue_or_else): Add function prototype.

From-SVN: r82679
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bb55756a442..36663e975e9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-06  Roger Sayle  <roger@eyesopen.com>
+
+	* tree.h (lvalue_or_else): Delete function prototype.
+	* c-typeck.c (lvalue_or_else): Make static.  Add static prototype.
+
 2004-06-06  Stephane Carrez  <stcarrez@nerim.fr>
 
 	PR target/14542
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index bdbb58b3f82..0f77d8c3397 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -80,6 +80,7 @@ static void add_pending_init (tree, tree);
 static void set_nonincremental_init (void);
 static void set_nonincremental_init_from_string (tree);
 static tree find_init_member (tree);
+static int lvalue_or_else (tree, const char *);
 
 /* Do `exp = require_complete_type (exp);' to make sure exp
    does not have an incomplete type.  (That includes void types.)  */
@@ -2629,7 +2630,7 @@ lvalue_p (tree ref)
 /* Return nonzero if REF is an lvalue valid for this language;
    otherwise, print an error message and return zero.  */
 
-int
+static int
 lvalue_or_else (tree ref, const char *msgid)
 {
   int win = lvalue_p (ref);
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 8ec1302e035..5bb506e58f5 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-06  Roger Sayle  <roger@eyesopen.com>
+
+	* cp/cp-tree.h (lvalue_or_else): Add function prototype.
+
 2004-06-06  Giovanni Bajo  <giovannibajo@gcc.gnu.org>
 
 	PR c++/15503
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h
index 3db4ab69ddb..6f7baf3b677 100644
--- a/gcc/cp/cp-tree.h
+++ b/gcc/cp/cp-tree.h
@@ -4114,6 +4114,7 @@ extern tree canonical_type_variant              (tree);
 extern tree copy_base_binfos			(tree, tree, tree);
 extern int member_p				(tree);
 extern cp_lvalue_kind real_lvalue_p             (tree);
+extern int lvalue_or_else			(tree, const char *);
 extern tree build_min				(enum tree_code, tree, ...);
 extern tree build_min_nt			(enum tree_code, ...);
 extern tree build_min_non_dep			(enum tree_code, tree, ...);
diff --git a/gcc/tree.h b/gcc/tree.h
index d3df75a0580..c6a9f078eca 100644
--- a/gcc/tree.h
+++ b/gcc/tree.h
@@ -3167,11 +3167,6 @@ extern int integer_nonzerop (tree);
 
 extern int staticp (tree);
 
-/* Gets an error if argument X is not an lvalue.
-   Also returns 1 if X is an lvalue, 0 if not.  */
-
-extern int lvalue_or_else (tree, const char *);
-
 /* save_expr (EXP) returns an expression equivalent to EXP
    but it can be used multiple times within context CTX
    and only evaluate EXP once.  */