about summary refs log tree commit diff
path: root/localedata/tests-mbwc/dat_wcscoll.c
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-07-08 15:02:58 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-07-08 15:02:58 +0530
commit7c33f1e52c7ed39416b24c894e61d39eabf6cd14 (patch)
tree4f19bb24fde0dfd9cd02bd1e87dd75a42dd6cce0 /localedata/tests-mbwc/dat_wcscoll.c
parent87868c2418fb74357757e3b739ce5b76b17a8929 (diff)
downloadglibc-7c33f1e52c7ed39416b24c894e61d39eabf6cd14.tar.gz
glibc-7c33f1e52c7ed39416b24c894e61d39eabf6cd14.tar.xz
glibc-7c33f1e52c7ed39416b24c894e61d39eabf6cd14.zip
Fix Wundef warning with SHOJI_IS_RIGHT
The macro is not defined anywhere, so it looks like we're convinced
that Shoji is wrong :)
Diffstat (limited to 'localedata/tests-mbwc/dat_wcscoll.c')
-rw-r--r--localedata/tests-mbwc/dat_wcscoll.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/localedata/tests-mbwc/dat_wcscoll.c b/localedata/tests-mbwc/dat_wcscoll.c
index cfc3f85c90..5e2fbbe65c 100644
--- a/localedata/tests-mbwc/dat_wcscoll.c
+++ b/localedata/tests-mbwc/dat_wcscoll.c
@@ -104,18 +104,6 @@ TST_WCSCOLL tst_wcscoll_loc [] = {
 			 { 0x0041,0x0041,0x0043,0x0000 }, },  /* #4 */
 	    /*expect*/ { 0,0,0, -1,			  },
 	  },
-#ifdef SHOJI_IS_RIGHT
-	  /* <WAIVER> */ /* assume ascii */
-	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
-			 { 0x0041,0x0061,0x0043,0x0000 }, },  /* #5 */
-	    /*expect*/ { 0,0,0, -1,			  },
-	  },
-	  /* <WAIVER> */ /* assume ascii */
-	  { /*input.*/ { { 0x0041,0x0061,0x0043,0x0000 },
-			 { 0x0041,0x0042,0x0043,0x0000 }, },  /* #6 */
-	    /*expect*/ { 0,0,0, +1,			  },
-	  },
-#else
 	  /* XXX Correct order is lowercase before uppercase.  */
 	  { /*input.*/ { { 0x0041,0x0042,0x0043,0x0000 },
 			 { 0x0041,0x0061,0x0043,0x0000 }, },  /* #5 */
@@ -125,7 +113,6 @@ TST_WCSCOLL tst_wcscoll_loc [] = {
 			 { 0x0041,0x0042,0x0043,0x0000 }, },  /* #6 */
 	    /*expect*/ { 0,0,0, -1,			  },
 	  },
-#endif
 	  { /*input.*/ { { 0x0041,0x0042,0x0000	       },
 			 { 0x0041,0x0042,0x0049,0x0000 }, },  /* #7 */
 	    /*expect*/ { 0,0,0, -1,			  },
@@ -134,16 +121,6 @@ TST_WCSCOLL tst_wcscoll_loc [] = {
 			 { 0x0041,0x0042,0x0000	       }, },  /* #8 */
 	    /*expect*/ { 0,0,0, +1,			  },
 	  },
-#ifdef SHOJI_IS_RIGHT
-	  { /*input.*/ { { 0x0041,0x0092,0x0049,0x0000 },
-			 { 0x0041,0x008E,0x0049,0x0000 }, },  /* #9 */
-	    /*expect*/ { 0,0,0, +1,		       },
-	  },
-	  { /*input.*/ { { 0x0041,0x008E,0x0049,0x0000 },
-			 { 0x0041,0x0092,0x0049,0x0000 }, },  /* #10 */
-	    /*expect*/ { 0,0,0, -1,		       },
-	  },
-#else
 	  /* Do not assume position of character out of range.  */
 	  { /*input.*/ { { 0x0041,0x0092,0x0049,0x0000 },
 			 { 0x0041,0x008E,0x0049,0x0000 }, },  /* #9 */
@@ -153,7 +130,6 @@ TST_WCSCOLL tst_wcscoll_loc [] = {
 			 { 0x0041,0x0092,0x0049,0x0000 }, },  /* #10 */
 	    /*expect*/ { 0,0,0, 0,		       },
 	  },
-#endif
 	  { .is_last = 1 }
 	}
     },