You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

40 lines
1.2 KiB

  1. diff --git a/src/webdav.c b/src/webdav.c
  2. index 1ff7c7f..74cd957 100644
  3. --- a/src/webdav.c
  4. +++ b/src/webdav.c
  5. @@ -25,7 +25,7 @@
  6. #ifdef HAVE_FCNTL_H
  7. #include <fcntl.h>
  8. #endif
  9. -#ifdef HAVE_ICONV_H
  10. +#ifdef HAVE_ICONV
  11. #include <iconv.h>
  12. #endif
  13. #ifdef HAVE_LANGINFO_H
  14. @@ -231,7 +231,7 @@ static int initialized;
  15. Needed by ssl_verify() which may be called at any time. */
  16. static int have_terminal;
  17. -#ifdef HAVE_ICONV_H
  18. +#ifdef HAVE_ICONV
  19. /* Handle to convert character encoding from utf-8 to LC_CTYPE.
  20. If NULL no conversion is done. */
  21. static iconv_t from_utf_8;
  22. @@ -264,7 +264,7 @@ static char **cookie_list;
  23. /* Private function prototypes and inline functions */
  24. /*==================================================*/
  25. -#ifdef HAVE_ICONV_H
  26. +#ifdef HAVE_ICONV
  27. static void
  28. convert(char **s, iconv_t conv);
  29. #endif
  30. @@ -337,7 +337,7 @@ dav_init_webdav(const dav_args *args)
  31. if (args->neon_debug & ~NE_DBG_HTTPPLAIN)
  32. syslog(LOG_MAKEPRI(LOG_DAEMON, LOG_DEBUG), "Initializing webdav");
  33. -#ifdef HAVE_ICONV_H
  34. +#ifdef HAVE_ICONV
  35. char *lc_charset = nl_langinfo(CODESET);
  36. if (lc_charset && strcasecmp(lc_charset, "UTF-8") != 0) {
  37. from_utf_8 = iconv_open(lc_charset, "UTF-8");