0008-Fix-quoting-of-xlocale-test-program-in-configure.in.patch 1.3 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243
  1. From: Nick Wellnhofer <wellnhofer@aevum.de>
  2. Date: Tue, 30 Jul 2013 11:57:28 +0000
  3. Subject: Fix quoting of xlocale test program in configure.in
  4. Double square brackets aren't needed anymore, probably due to the
  5. changes in commit a2cd8a03.
  6. ---
  7. configure.in | 14 +++++++-------
  8. 1 file changed, 7 insertions(+), 7 deletions(-)
  9. diff --git a/configure.in b/configure.in
  10. index 767e980..ac004fe 100644
  11. --- a/configure.in
  12. +++ b/configure.in
  13. @@ -196,21 +196,21 @@ typedef locale_t xsltLocale;
  14. #endif
  15. ]],[[
  16. xsltLocale locale;
  17. - const char *src[[2]] = { "\xc3\x84rger", "Zeppelin" };
  18. - char *dst[[2]];
  19. + const char *src[2] = { "\xc3\x84rger", "Zeppelin" };
  20. + char *dst[2];
  21. size_t len, r;
  22. int i;
  23. locale = newlocale(LC_COLLATE_MASK, "en_US.utf8", NULL);
  24. if (locale == NULL) exit(1);
  25. for (i=0; i<2; ++i) {
  26. - len = strxfrm_l(NULL, src[[i]], 0, locale) + 1;
  27. - dst[[i]] = malloc(len);
  28. - if(dst[[i]] == NULL) exit(1);
  29. - r = strxfrm_l(dst[[i]], src[[i]], len, locale);
  30. + len = strxfrm_l(NULL, src[i], 0, locale) + 1;
  31. + dst[i] = malloc(len);
  32. + if(dst[i] == NULL) exit(1);
  33. + r = strxfrm_l(dst[i], src[i], len, locale);
  34. if(r >= len) exit(1);
  35. }
  36. - if (strcmp(dst[[0]], dst[[1]]) >= 0) exit(1);
  37. + if (strcmp(dst[0], dst[1]) >= 0) exit(1);
  38. exit(0);
  39. return(0);