diff options
| author | Nicholas Clark <nick@ccl4.org> | 2007-03-05 12:26:46 +0000 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2007-03-05 12:26:46 +0000 |
| commit | 2242947801b5a89c42ffba93b4c406f75e4cd049 (patch) | |
| tree | d5e69a16f0c5aa389527a08a3576fa689f78d09b | |
| parent | 9396c84faf040d3bed1ef186b6e6ce1fd26b8a19 (diff) | |
| download | perl-2242947801b5a89c42ffba93b4c406f75e4cd049.tar.gz | |
Change 30461 was wrong. As ext/re (re)builds the regexp engine with
-DDEBUGGING, it's going to need PL_reg_name even if core perl doesn't.
So something is always going to use it, so always define it, and always
export it. (But only define it once, so that static builds work.)
p4raw-id: //depot/perl@30464
| -rw-r--r-- | makedef.pl | 1 | ||||
| -rw-r--r-- | regcomp.pl | 8 | ||||
| -rw-r--r-- | regnodes.h | 8 |
3 files changed, 6 insertions, 11 deletions
diff --git a/makedef.pl b/makedef.pl index a5d81a011b..ea06236d8d 100644 --- a/makedef.pl +++ b/makedef.pl @@ -593,7 +593,6 @@ unless ($define{'DEBUGGING'}) { Perl_sv_peek Perl_hv_assert PL_block_type - PL_reg_name PL_watchaddr PL_watchok PL_watch_pvx diff --git a/regcomp.pl b/regcomp.pl index 89bbbe0271..38c346cc0c 100644 --- a/regcomp.pl +++ b/regcomp.pl @@ -161,10 +161,9 @@ print OUT <<EOP; /* reg_name[] - Opcode/state names in string form, for debugging */ -#ifdef DEBUGGING -# ifndef DOINIT +#ifndef DOINIT EXTCONST char * PL_reg_name[]; -# else +#else EXTCONST char * PL_reg_name[] = { EOP @@ -186,8 +185,7 @@ while (++$ind <= $tot) { print OUT <<EOP; }; -# endif /* DOINIT */ -#endif /* DEBUGGING */ +#endif /* DOINIT */ /* ex: set ro: */ EOP diff --git a/regnodes.h b/regnodes.h index 2f21dd9971..6f6e0b262a 100644 --- a/regnodes.h +++ b/regnodes.h @@ -456,10 +456,9 @@ static const char reg_off_by_arg[] = { /* reg_name[] - Opcode/state names in string form, for debugging */ -#ifdef DEBUGGING -# ifndef DOINIT +#ifndef DOINIT EXTCONST char * PL_reg_name[]; -# else +#else EXTCONST char * PL_reg_name[] = { "END", /* 0000 */ "SUCCEED", /* 0x01 */ @@ -588,7 +587,6 @@ EXTCONST char * PL_reg_name[] = { "KEEPS_next", /* REGNODE_MAX +0x27 */ "KEEPS_next_fail", /* REGNODE_MAX +0x28 */ }; -# endif /* DOINIT */ -#endif /* DEBUGGING */ +#endif /* DOINIT */ /* ex: set ro: */ |