remove conflict in pending_ident function and field name

p4raw-id: //depot/perl@29660

diff --git a/embed.fnc b/embed.fnc
index fecb528..135e643 100644 (file)
--- a/embed.fnc
+++ b/embed.fnc
@@ -1461,7 +1461,6 @@ s |char*  |force_version  |NN char *start|int guessing
 s      |char*  |force_word     |NN char *start|int token|int check_keyword \
                                |int allow_pack|int allow_tick
 s      |SV*    |tokeq          |NN SV *sv
-s      |int    |pending_ident
 s      |void   |readpipe_override|
 sR     |char*  |scan_const     |NN char *start
 sR     |char*  |scan_formline  |NN char *s

diff --git a/embed.h b/embed.h
index 4dc5616..625c478 100644 (file)
--- a/embed.h
+++ b/embed.h
@@ -1460,7 +1460,6 @@
 #define force_version          S_force_version
 #define force_word             S_force_word
 #define tokeq                  S_tokeq
-#define pending_ident          S_pending_ident
 #define readpipe_override      S_readpipe_override
 #define scan_const             S_scan_const
 #define scan_formline          S_scan_formline
@@ -3671,7 +3670,6 @@
 #define force_version(a,b)     S_force_version(aTHX_ a,b)
 #define force_word(a,b,c,d,e)  S_force_word(aTHX_ a,b,c,d,e)
 #define tokeq(a)               S_tokeq(aTHX_ a)
-#define pending_ident()                S_pending_ident(aTHX)
 #define readpipe_override()    S_readpipe_override(aTHX)
 #define scan_const(a)          S_scan_const(aTHX_ a)
 #define scan_formline(a)       S_scan_formline(aTHX_ a)

diff --git a/proto.h b/proto.h
index b908cf2..7c975b3 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -3922,7 +3922,6 @@ STATIC char*      S_force_word(pTHX_ char *start, int token, int check_keyword, int a
 STATIC SV*     S_tokeq(pTHX_ SV *sv)
                        __attribute__nonnull__(pTHX_1);
 
-STATIC int     S_pending_ident(pTHX);
 STATIC void    S_readpipe_override(pTHX);
 STATIC char*   S_scan_const(pTHX_ char *start)
                        __attribute__warn_unused_result__

diff --git a/toke.c b/toke.c
index 1655918..19b117b 100644 (file)
--- a/toke.c
+++ b/toke.c
@@ -65,6 +65,8 @@
 #  define PL_thiswhite         (PL_parser->thiswhite)
 #endif
 
+static int
+S_pending_ident(pTHX);
 
 static const char ident_too_long[] = "Identifier too long";
 static const char commaless_variable_list[] = "comma-less variable list";