[Bast-commits] r4875 - Devel-Declare/1.000/trunk

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2008-10-04 03:32:03 +0100 (Sat, 04 Oct 2008)
New Revision: 4875

Modified:
   Devel-Declare/1.000/trunk/Changes
   Devel-Declare/1.000/trunk/stolen_chunk_of_toke.c
Log:
Revert "nuke PERL_5_9_PLUS"

Using #ifdef PL_parser is not enough. In some perls, depending on
configuration, PL_parser is a real symbol and not a define.

Modified: Devel-Declare/1.000/trunk/Changes
===================================================================
--- Devel-Declare/1.000/trunk/Changes	2008-10-04 02:31:56 UTC (rev 4874)
+++ Devel-Declare/1.000/trunk/Changes	2008-10-04 02:32:03 UTC (rev 4875)
@@ -1,6 +1,5 @@
 Changes for Devel-Declare
 
-  - eliminate PERL_5_9_PLUS macro in favour of ifdef PL_parser
   - clean up checks for whether we're lexing and whether lex_stuff exists
     to handle the PL_parser factor-out in 5.10
 

Modified: Devel-Declare/1.000/trunk/stolen_chunk_of_toke.c
===================================================================
--- Devel-Declare/1.000/trunk/stolen_chunk_of_toke.c	2008-10-04 02:31:56 UTC (rev 4874)
+++ Devel-Declare/1.000/trunk/stolen_chunk_of_toke.c	2008-10-04 02:32:03 UTC (rev 4875)
@@ -83,7 +83,11 @@
 #define PERL_5_8_8_PLUS
 #endif
 
-#ifdef PL_parser
+#if PERL_REVISION == 5 && PERL_VERSION > 8
+#define PERL_5_9_PLUS
+#endif
+
+#ifdef PERL_5_9_PLUS
 /* 5.9+ moves a bunch of things to a PL_parser struct so we need to
    declare the backcompat macros for things to still work (mst) */