re-enable building against parrot HEAD

Patch courtesy (mostly) by cotto++

build/PARROT_REVISION

@@ -1 +1 @@
-40185 1.4.0
+40249

perl6.pir

@@ -359,13 +359,13 @@ to the Perl 6 compiler.
     $P1 = $P0.'command_line'(args_str, 'encoding'=>'utf8', 'transcode'=>'ascii iso-8859-1')
 
     .include 'iterator.pasm'
-    .local pmc iter
+    .local pmc it
     $P0 = get_hll_global ['Perl6'], '@?END_BLOCKS'
-    iter = new 'Iterator', $P0
-    iter = .ITERATE_FROM_END
+    it = iter $P0
+    it = .ITERATE_FROM_END
   iter_loop:
-    unless iter goto iter_end
-    $P0 = pop iter
+    unless it goto iter_end
+    $P0 = pop it
     $P0()
     goto iter_loop
   iter_end:

src/ops/perl6.ops

@@ -3,9 +3,10 @@
  * Copyright (C) 2008-2009, The Perl Foundation.
  */
 
+BEGIN_OPS_PREAMBLE
+
 #include "parrot/dynext.h"
 #include "pmc_object.h"
-VERSION = PARROT_VERSION;
 
 #if PARROT_HAS_ICU
 #  include <unicode/uchar.h>
@@ -15,6 +16,8 @@ VERSION = PARROT_VERSION;
 static INTVAL p6s_id = 0;
 static INTVAL or_id = 0;
 
+END_OPS_PREAMBLE
+
 /*
 
 =item rebless_subclass(in PMC, in PMC)