Regen headers.

p4raw-id: //depot/perl@12009

4 files changed, 9 insertions, 15 deletions

diff --git a/embed.h b/embed.h
index ebdac3420b..ae62d1236b 100644
--- a/embed.h
+++ b/embed.h
@@ -871,10 +871,8 @@
 #define sys_intern_clear	Perl_sys_intern_clear
 #define sys_intern_init		Perl_sys_intern_init
 #endif
-#if defined(PERL_CUSTOM_OPS)
 #define custom_op_name		Perl_custom_op_name
 #define custom_op_desc		Perl_custom_op_desc
-#endif
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 #define avhv_index_sv		S_avhv_index_sv
 #define avhv_index		S_avhv_index
@@ -2384,10 +2382,8 @@
 #define sys_intern_clear()	Perl_sys_intern_clear(aTHX)
 #define sys_intern_init()	Perl_sys_intern_init(aTHX)
 #endif
-#if defined(PERL_CUSTOM_OPS)
 #define custom_op_name(a)	Perl_custom_op_name(aTHX_ a)
 #define custom_op_desc(a)	Perl_custom_op_desc(aTHX_ a)
-#endif
 #if defined(PERL_IN_AV_C) || defined(PERL_DECL_PROT)
 #define avhv_index_sv(a)	S_avhv_index_sv(aTHX_ a)
 #define avhv_index(a,b,c)	S_avhv_index(aTHX_ a,b,c)
diff --git a/opcode.h b/opcode.h
index a8a0439999..f9dd890f3d 100644
--- a/opcode.h
+++ b/opcode.h
@@ -11,15 +11,11 @@
 
 START_EXTERN_C
 
-#ifdef PERL_CUSTOM_OPS
+
 #define OP_NAME(o) (o->op_type == OP_CUSTOM ? custom_op_name(o) : \
                     PL_op_name[o->op_type])
 #define OP_DESC(o) (o->op_type == OP_CUSTOM ? custom_op_desc(o) : \
                     PL_op_desc[o->op_type])
-#else
-#define OP_NAME(o) PL_op_name[o->op_type]
-#define OP_DESC(o) PL_op_desc[o->op_type]
-#endif
 
 #ifndef DOINIT
 EXT char *PL_op_name[];
diff --git a/pod/perlapi.pod b/pod/perlapi.pod
index 0c76cff2c4..12abd71714 100644
--- a/pod/perlapi.pod
+++ b/pod/perlapi.pod
@@ -575,8 +575,9 @@ returns UV_MAX, sets C<PERL_SCAN_GREATER_THAN_UV_MAX> in the output flags,
 and writes the value to I<*result> (or the value is discarded if I<result>
 is NULL).
 
-The hex number may optinally be prefixed with "0b" or "b". If
-C<PERL_SCAN_ALLOW_UNDERSCORES> is set in I<*flags> on entry then the binary
+The hex number may optinally be prefixed with "0b" or "b" unless
+C<PERL_SCAN_DISALLOW_PREFIX> is set in I<*flags> on entry. If
+C<PERL_SCAN_ALLOW_UNDERSCORES> is set in I<*flags> then the binary
 number may use '_' characters to separate digits.
 
 	UV	grok_bin(char* start, STRLEN* len, I32* flags, NV *result)
@@ -600,8 +601,9 @@ returns UV_MAX, sets C<PERL_SCAN_GREATER_THAN_UV_MAX> in the output flags,
 and writes the value to I<*result> (or the value is discarded if I<result>
 is NULL).
 
-The hex number may optinally be prefixed with "0x" or "x". If
-C<PERL_SCAN_ALLOW_UNDERSCORES> is set in I<*flags> on entry then the hex
+The hex number may optinally be prefixed with "0x" or "x" unless
+C<PERL_SCAN_DISALLOW_PREFIX> is set in I<*flags> on entry. If
+C<PERL_SCAN_ALLOW_UNDERSCORES> is set in I<*flags> then the hex
 number may use '_' characters to separate digits.
 
 	UV	grok_hex(char* start, STRLEN* len, I32* flags, NV *result)
diff --git a/proto.h b/proto.h
index f44ecdce8c..2c8e8c9c4c 100644
--- a/proto.h
+++ b/proto.h
@@ -963,10 +963,10 @@ PERL_CALLCONV void	Perl_ptr_table_free(pTHX_ PTR_TBL_t *tbl);
 PERL_CALLCONV void	Perl_sys_intern_clear(pTHX);
 PERL_CALLCONV void	Perl_sys_intern_init(pTHX);
 #endif
-#if defined(PERL_CUSTOM_OPS)
+
 PERL_CALLCONV char *	Perl_custom_op_name(pTHX_ OP* op);
 PERL_CALLCONV char *	Perl_custom_op_desc(pTHX_ OP* op);
-#endif
+
 
 END_EXTERN_C