projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'snapshot-start' into stable
[gnulib.git]
/
tests
/
uniconv
/
test-u8-strconv-from-enc.c
diff --git
a/tests/uniconv/test-u8-strconv-from-enc.c
b/tests/uniconv/test-u8-strconv-from-enc.c
index
74c3869
..
30ebe76
100644
(file)
--- a/
tests/uniconv/test-u8-strconv-from-enc.c
+++ b/
tests/uniconv/test-u8-strconv-from-enc.c
@@
-1,5
+1,5
@@
/* Test of conversion to UTF-8 from legacy encodings.
/* Test of conversion to UTF-8 from legacy encodings.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007
-2010
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-20,22
+20,10
@@
#include "uniconv.h"
#include "uniconv.h"
-#include <stdio.h>
#include <stdlib.h>
#include "unistr.h"
#include <stdlib.h>
#include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
- do \
- { \
- if (!(expr)) \
- { \
- fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
- abort (); \
- } \
- } \
- while (0)
+#include "macros.h"
int
main ()
int
main ()
@@
-73,7
+61,7
@@
main ()
}
/* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */
}
/* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */
-# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__)
+# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__
|| defined __sun
)
/* Test conversions from autodetect_jp to UTF-8. */
for (h = 0; h < SIZEOF (handlers); h++)
{
/* Test conversions from autodetect_jp to UTF-8. */
for (h = 0; h < SIZEOF (handlers); h++)
{