summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doio.c4
-rw-r--r--ext/B/B.pm2
-rw-r--r--ext/IPC/SysV/SysV.xs2
-rw-r--r--ext/Opcode/Opcode.pm2
-rw-r--r--op.h4
-rw-r--r--os2/os2.c2
-rw-r--r--vms/gen_shrfls.pl19
7 files changed, 8 insertions, 27 deletions
diff --git a/doio.c b/doio.c
index f0f7aa7fca..0cdf87d68a 100644
--- a/doio.c
+++ b/doio.c
@@ -1444,7 +1444,7 @@ do_ipcget(I32 optype, SV **mark, SV **sp)
#endif
#if !defined(HAS_MSG) || !defined(HAS_SEM) || !defined(HAS_SHM)
default:
- croak("%s not implemented", op_desc[optype]);
+ croak("%s not implemented", PL_op_desc[optype]);
#endif
}
return -1; /* should never happen */
@@ -1501,7 +1501,7 @@ do_ipcctl(I32 optype, SV **mark, SV **sp)
#endif
#if !defined(HAS_MSG) || !defined(HAS_SEM) || !defined(HAS_SHM)
default:
- croak("%s not implemented", op_desc[optype]);
+ croak("%s not implemented", PL_op_desc[optype]);
#endif
}
diff --git a/ext/B/B.pm b/ext/B/B.pm
index 562f56bc33..0fff04de87 100644
--- a/ext/B/B.pm
+++ b/ext/B/B.pm
@@ -578,7 +578,7 @@ This returns the function name as a string (e.g. pp_add, pp_rv2av).
=item desc
-This returns the op description from the global C op_desc array
+This returns the op description from the global C PL_op_desc array
(e.g. "addition" "array deref").
=item targ
diff --git a/ext/IPC/SysV/SysV.xs b/ext/IPC/SysV/SysV.xs
index cda71707ad..1f87a4d46e 100644
--- a/ext/IPC/SysV/SysV.xs
+++ b/ext/IPC/SysV/SysV.xs
@@ -195,7 +195,7 @@ ftok(path, id)
key_t k = ftok(path, id);
ST(0) = k == (key_t) -1 ? &PL_sv_undef : sv_2mortal(newSViv(k));
#else
- DIE(no_func, "ftok");
+ DIE(PL_no_func, "ftok");
#endif
int
diff --git a/ext/Opcode/Opcode.pm b/ext/Opcode/Opcode.pm
index 0ee6be6955..533e6af3e4 100644
--- a/ext/Opcode/Opcode.pm
+++ b/ext/Opcode/Opcode.pm
@@ -130,7 +130,7 @@ Your mileage will vary. If in any doubt B<do not use it>.
=head1 Operator Names and Operator Lists
The canonical list of operator names is the contents of the array
-op_name defined and initialised in file F<opcode.h> of the Perl
+PL_op_name defined and initialised in file F<opcode.h> of the Perl
source distribution (and installed into the perl library).
Each operator has both a terse name (its opname) and a more verbose or
diff --git a/op.h b/op.h
index 0b186a89db..31f018d6e4 100644
--- a/op.h
+++ b/op.h
@@ -285,7 +285,7 @@ struct loop {
#define Nullop Null(OP*)
-/* Lowest byte of opargs */
+/* Lowest byte of PL_opargs */
#define OA_MARK 1
#define OA_FOLDCONST 2
#define OA_RETSCALAR 4
@@ -316,7 +316,7 @@ struct loop {
#define OASHIFT 12
-/* Remaining nybbles of opargs */
+/* Remaining nybbles of PL_opargs */
#define OA_SCALAR 1
#define OA_LIST 2
#define OA_AVREF 3
diff --git a/os2/os2.c b/os2/os2.c
index 6c2d67ac1f..008eda38f9 100644
--- a/os2/os2.c
+++ b/os2/os2.c
@@ -1009,7 +1009,7 @@ char *mode;
int
fork(void)
{
- die(no_func, "Unsupported function fork");
+ die(PL_no_func, "Unsupported function fork");
errno = EINVAL;
return -1;
}
diff --git a/vms/gen_shrfls.pl b/vms/gen_shrfls.pl
index ac92374995..750abb0a66 100644
--- a/vms/gen_shrfls.pl
+++ b/vms/gen_shrfls.pl
@@ -430,22 +430,3 @@ __END__
regkind=vars # declared in regcomp.h
simple=vars # declared in regcomp.h
varies=vars # declared in regcomp.h
-watchaddr=vars # declared in run.c
-watchok=vars # declared in run.c
-yychar=vars # generated by byacc in perly.c
-yycheck=vars # generated by byacc in perly.c
-yydebug=vars # generated by byacc in perly.c
-yydefred=vars # generated by byacc in perly.c
-yydgoto=vars # generated by byacc in perly.c
-yyerrflag=vars # generated by byacc in perly.c
-yygindex=vars # generated by byacc in perly.c
-yylen=vars # generated by byacc in perly.c
-yylhs=vars # generated by byacc in perly.c
-yylval=vars # generated by byacc in perly.c
-yyname=vars # generated by byacc in perly.c
-yynerrs=vars # generated by byacc in perly.c
-yyrindex=vars # generated by byacc in perly.c
-yyrule=vars # generated by byacc in perly.c
-yysindex=vars # generated by byacc in perly.c
-yytable=vars # generated by byacc in perly.c
-yyval=vars # generated by byacc in perly.c