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
6193bfa
..
30ebe76
100644
(file)
--- a/
tests/uniconv/test-u8-strconv-from-enc.c
+++ b/
tests/uniconv/test-u8-strconv-from-enc.c
@@
-1,10
+1,10
@@
/* 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
+ 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,23
+12,18
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Bruno Haible <bruno@clisp.org>, 2007. */
/* Written by Bruno Haible <bruno@clisp.org>, 2007. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include "uniconv.h"
#include <stdlib.h>
#include "unistr.h"
#include "uniconv.h"
#include <stdlib.h>
#include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) if (!(expr)) abort ();
+#include "macros.h"
int
main ()
int
main ()
@@
-65,6
+60,8
@@
main ()
free (result);
}
free (result);
}
+ /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */
+# 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++)
{
@@
-96,6
+93,7
@@
main ()
ASSERT (u8_strcmp (result, expected) == 0);
free (result);
}
ASSERT (u8_strcmp (result, expected) == 0);
free (result);
}
+# endif
#endif
#endif