about summary refs log tree commit diff
path: root/localedata/tests-mbwc/dat_wcwidth.c
diff options
context:
space:
mode:
Diffstat (limited to 'localedata/tests-mbwc/dat_wcwidth.c')
-rw-r--r--localedata/tests-mbwc/dat_wcwidth.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/localedata/tests-mbwc/dat_wcwidth.c b/localedata/tests-mbwc/dat_wcwidth.c
index d57a3d4247..5472d1f559 100644
--- a/localedata/tests-mbwc/dat_wcwidth.c
+++ b/localedata/tests-mbwc/dat_wcwidth.c
@@ -28,10 +28,16 @@ TST_WCWIDTH tst_wcwidth_loc [] = {
 	{ /*inp*/ { 0x00C1		     },	 /* #06 */
 	  /*exp*/ { 0,0,	1,1,	     },
 	},
+#ifdef SHOJI_IS_RIGHT
 	/* <WAIVER> */	/* CHECK : wint_t */
 	{ /*inp*/ { 0x3041		     },	 /* #07 */
 	  /*exp*/ { 0,0,	1,0,	     },
 	},
+#else
+	{ /*inp*/ { 0x3041		     },	 /* #07 */
+	  /*exp*/ { 0,0,	1,EOF,	     },
+	},
+#endif
 	{ is_last: 1 }
       }
     },
@@ -50,15 +56,12 @@ TST_WCWIDTH tst_wcwidth_loc [] = {
 	{ /*inp*/ { 0x0080		     },	 /* #04 */
 	  /*exp*/ { 0,0,	1,-1,	     },
 	},
-	/* <WAIVER> */	/* assume ascii */
 	{ /*inp*/ { 0x00A1		     },	 /* #05 */
 	  /*exp*/ { 0,0,	1,-1,	     },
 	},
-	/* <WAIVER> */	/* assume ascii */
 	{ /*inp*/ { 0x00C1		     },	 /* #06 */
 	  /*exp*/ { 0,0,	1,-1,	     },
 	},
-	/* <WAIVER> */	/* CHECK : wint_t */
 	{ /*inp*/ { 0x3041		     },	 /* #07 */
 	  /*exp*/ { 0,0,	1,-1,	     },
 	},
@@ -80,10 +83,17 @@ TST_WCWIDTH tst_wcwidth_loc [] = {
 	{ /*inp*/ { 0x0080		     },	 /* #04 */
 	  /*exp*/ { 0,0,	1,-1,	     },
 	},
+#ifdef SHOJI_IS_RIGHT
 	/* <NO_WAIVER> */
 	{ /*inp*/ { 0x00A1		     },	 /* #05 */
 	  /*exp*/ { 0,0,	1,0,	     },
 	},
+#else
+	/* XXX U00A1 is a valid character in EUC-JP.  */
+	{ /*inp*/ { 0x00A1		     },	 /* #05 */
+	  /*exp*/ { 0,0,	1,2,	     },
+	},
+#endif
 	/* jisx0212 */
 	{ /*inp*/ { 0x00C1		     },	 /* #06 */
 	  /*exp*/ { 0,0,	1,2,	     },