* tests/uninorm/test-nfc.c (n): Don't define on Android.
(main): Add 'volatile', to defeat a GCC optimization that would
eliminate the reference.
* tests/uninorm/test-nfd.c (n): Don't define on Android.
(main): Add 'volatile', to defeat a GCC optimization that would
eliminate the reference.
* tests/uninorm/test-nfkc.c (n): Don't define on Android.
(main): Add 'volatile', to defeat a GCC optimization that would
eliminate the reference.
* tests/uninorm/test-nfkd.c (n): Don't define on Android.
(main): Add 'volatile', to defeat a GCC optimization that would
eliminate the reference.
+2019-01-28 Bruno Haible <bruno@clisp.org>
+
+ Fix build error when building a shared libunistring on Android.
+ * tests/uninorm/test-nfc.c (n): Don't define on Android.
+ (main): Add 'volatile', to defeat a GCC optimization that would
+ eliminate the reference.
+ * tests/uninorm/test-nfd.c (n): Don't define on Android.
+ (main): Add 'volatile', to defeat a GCC optimization that would
+ eliminate the reference.
+ * tests/uninorm/test-nfkc.c (n): Don't define on Android.
+ (main): Add 'volatile', to defeat a GCC optimization that would
+ eliminate the reference.
+ * tests/uninorm/test-nfkd.c (n): Don't define on Android.
+ (main): Add 'volatile', to defeat a GCC optimization that would
+ eliminate the reference.
+
2019-01-27 Bruno Haible <bruno@clisp.org>
Avoid build errors due to wrong references between modules.
#include "uninorm.h"
-#if !WOE32DLL
+#if !(WOE32DLL || defined __ANDROID__)
/* Check that UNINORM_NFC is defined and links. */
uninorm_t n = UNINORM_NFC;
#endif
main ()
{
/* Check that UNINORM_NFC is defined and links. */
- uninorm_t nf = UNINORM_NFC;
+ volatile uninorm_t nf = UNINORM_NFC;
(void) nf;
test_u32_nfc ();
#include "uninorm.h"
-#if !WOE32DLL
+#if !(WOE32DLL || defined __ANDROID__)
/* Check that UNINORM_NFD is defined and links. */
uninorm_t n = UNINORM_NFD;
#endif
main ()
{
/* Check that UNINORM_NFD is defined and links. */
- uninorm_t nf = UNINORM_NFD;
+ volatile uninorm_t nf = UNINORM_NFD;
(void) nf;
test_u32_nfd ();
#include "uninorm.h"
-#if !WOE32DLL
+#if !(WOE32DLL || defined __ANDROID__)
/* Check that UNINORM_NFKC is defined and links. */
uninorm_t n = UNINORM_NFKC;
#endif
main ()
{
/* Check that UNINORM_NFKC is defined and links. */
- uninorm_t nf = UNINORM_NFKC;
+ volatile uninorm_t nf = UNINORM_NFKC;
(void) nf;
test_u32_nfkc ();
#include "uninorm.h"
-#if !WOE32DLL
+#if !(WOE32DLL || defined __ANDROID__)
/* Check that UNINORM_NFKD is defined and links. */
uninorm_t n = UNINORM_NFKD;
#endif
main ()
{
/* Check that UNINORM_NFKD is defined and links. */
- uninorm_t nf = UNINORM_NFKD;
+ volatile uninorm_t nf = UNINORM_NFKD;
(void) nf;
test_u32_nfkd ();