Merge branch 'master' of git@github.com:parrot/parrot

parrot · Dec 1, 2010 · 8c09a00 · 8c09a00
2 parents 2231f2f + fe4a42f
commit 8c09a00
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/include/parrot/hll.h b/include/parrot/hll.h
@@ -11,6 +11,10 @@
 #ifndef PARROT_HLL_H_GUARD
 #define PARROT_HLL_H_GUARD
 
+/* Temporary defines to help keep some symbols around during the rename
+   transition. TT #443. Can be removed after 2.11 */
+#define Parrot_get_ctx_HLL_namespace Parrot_hll_get_ctx_HLL_namespace
+
 /* this invalid HLL type means "no HLL" when passed to the below functions */
 #define PARROT_HLL_NONE -1
 

diff --git a/t/op/string_cs.t b/t/op/string_cs.t
@@ -738,7 +738,7 @@ CODE
 OUTPUT
 
 SKIP: {
-    skip( 'no ICU lib', 8 ) unless $PConfig{has_icu};
+    skip( 'no ICU lib', 10 ) unless $PConfig{has_icu};
 
     pir_output_is( <<'CODE', <<"OUTPUT", "unicode downcase" );
 .sub main :main