Patchwork [libcpp] Add 'inline' to prototype of tokens_buff_remove_last_token

login
register
mail settings
Submitter Dodji Seketeli
Date Dec. 3, 2011, 10:54 p.m.
Message ID <m3vcpxqna0.fsf@redhat.com>
Download mbox | patch
Permalink /patch/129118/
State New
Headers show

Comments

Dodji Seketeli - Dec. 3, 2011, 10:54 p.m.
Hello,

in macro.c, I have inadvertently added an "inline" function specifier
to the definition of the static tokens_buff_remove_last_token
definition while its previous prototype didn't have the "inline".

There is code using the that function before the definition (and after
its declaration) and apparently GCC 4.3 warns about that, as Steven
Bosscher reported at http://gcc.gnu.org/ml/gcc/2011-12/msg00002.html.

I am thus simply adding the "inline" to the prototype and am going to
commit it as obvious.  I did the same to the other occurrence of the
same issue that I found in the file.

Bootstrapped on x86_64-unknown-linux-gnu against trunk.

libcpp/

	* macro.c (tokens_buff_remove_last_token)
	(tokens_buff_put_token_to): Add an 'inline' function specifier to
	the prototype.
---
 libcpp/ChangeLog |    6 ++++++
 libcpp/macro.c   |   16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

Patch

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 1df9e08..f47bf03 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,9 @@ 
+2011-12-03  Dodji Seketeli  <dodji@redhat.com>
+
+	* macro.c (tokens_buff_remove_last_token)
+	(tokens_buff_put_token_to): Add an 'inline' function specifier to
+	the prototype.
+
 2011-11-22   Diego Novillo  <dnovillo@google.com>
 
 	* include/line-map.h (linemap_dump): Declare.
diff --git a/libcpp/macro.c b/libcpp/macro.c
index f313959..d96b263 100644
--- a/libcpp/macro.c
+++ b/libcpp/macro.c
@@ -128,13 +128,13 @@  static _cpp_buff *tokens_buff_new (cpp_reader *, size_t,
 				   source_location **);
 static size_t tokens_buff_count (_cpp_buff *);
 static const cpp_token **tokens_buff_last_token_ptr (_cpp_buff *);
-static const cpp_token **tokens_buff_put_token_to (const cpp_token **,
-						   source_location *, 
-						   const cpp_token *,
-						   source_location,
-						   source_location,
-						   const struct line_map *,
-						   unsigned int);
+static inline const cpp_token **tokens_buff_put_token_to (const cpp_token **,
+                                                          source_location *,
+                                                          const cpp_token *,
+                                                          source_location,
+                                                          source_location,
+                                                          const struct line_map *,
+                                                          unsigned int);
 
 static const cpp_token **tokens_buff_add_token (_cpp_buff *,
 						source_location *,
@@ -143,7 +143,7 @@  static const cpp_token **tokens_buff_add_token (_cpp_buff *,
 						source_location,
 						const struct line_map *,
 						unsigned int);
-static void tokens_buff_remove_last_token (_cpp_buff *);
+static inline void tokens_buff_remove_last_token (_cpp_buff *);
 static void replace_args (cpp_reader *, cpp_hashnode *, cpp_macro *,
 			  macro_arg *, source_location);
 static _cpp_buff *funlike_invocation_p (cpp_reader *, cpp_hashnode *,