about summary refs log tree commit diff
path: root/localedata/tests-mbwc/dat_swscanf.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_swscanf.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_swscanf.c')
-rw-r--r--localedata/tests-mbwc/dat_swscanf.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/localedata/tests-mbwc/dat_swscanf.c b/localedata/tests-mbwc/dat_swscanf.c
index 08fd2d508c..7f6583222a 100644
--- a/localedata/tests-mbwc/dat_swscanf.c
+++ b/localedata/tests-mbwc/dat_swscanf.c
@@ -61,13 +61,8 @@ TST_SWSCANF tst_swscanf_loc [] =
       },
 	  L"1%d:2%d:3%d:4%d:5%d:6%d:7%d:8%d:9%d", 0
       },
-#ifdef SHOJI_IS_RIGHT
-	{ 1,EINVAL,1,WEOF,
-	  0,0,0,0,"", { 0x0000 },
-#else
 	{ 0,1,0,
 	  0,0,0,0,"", { 0x0000 },
-#endif
 	},
       },
       /*---------------------------------------------------*/
@@ -155,22 +150,6 @@ TST_SWSCANF tst_swscanf_loc [] =
 	  0, 1, 3.9, 'a', "cd", { 0x0000 }
 	},
       },
-#ifdef SHOJI_IS_RIGHT
-      /* XXX This test does not make sense.  The format string is
-	 L"\x1\x2\x25\x53" and it is supposed to match the words
-	 0x30A2, 0x30A4, 0x0001.  */
-      /*------------------------ 04 -----------------------*/
-      /* <NO_WAIVER> x 2 */
-      { { {
-	0x30A2, 0x30A4, 0x0001, 0x0000
-      },
-	  { 0x0001,0x0002,0x0025,0x0053,0x0000 }, 'S'
-      },
-	{ EILSEQ,1,EOF,
-	  0,0,0,0,"", { 0x0000 }
-	},
-      },
-#endif
       /*---------------------------------------------------*/
       { .is_last = 1}	/* Last element.  */
     }