projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2007-08-06 Simon Josefsson <simon@josefsson.org>
[gnulib.git]
/
tests
/
uniconv
/
test-u8-conv-from-enc.c
diff --git
a/tests/uniconv/test-u8-conv-from-enc.c
b/tests/uniconv/test-u8-conv-from-enc.c
index
69e44d5
..
0e41564
100644
(file)
--- a/
tests/uniconv/test-u8-conv-from-enc.c
+++ b/
tests/uniconv/test-u8-conv-from-enc.c
@@
-17,19
+17,27
@@
/* 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 "uniconv.h"
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "unistr.h"
#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
#include <stdlib.h>
#include <string.h>
#include "unistr.h"
#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) if (!(expr)) abort ();
+#define ASSERT(expr) \
+ do \
+ { \
+ if (!(expr)) \
+ { \
+ fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
+ abort (); \
+ } \
+ } \
+ while (0)
/* Magic number for detecting bounds violations. */
#define MAGIC 0x1983EFF1
/* Magic number for detecting bounds violations. */
#define MAGIC 0x1983EFF1
@@
-117,6
+125,8
@@
main ()
}
}
}
}
+ /* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */
+# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__)
/* 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++)
{
@@
-205,6
+215,7
@@
main ()
free (result);
}
}
free (result);
}
}
+# endif
#endif
#endif