1.1 --- a/include/SDL_stdinc.h	Mon Sep 21 11:04:01 2009 +0000
     1.2 +++ b/include/SDL_stdinc.h	Mon Sep 21 11:31:28 2009 +0000
     1.3 @@ -75,7 +75,7 @@
     1.4  #ifdef HAVE_MATH_H
     1.5  # include <math.h>
     1.6  #endif
     1.7 -#ifdef HAVE_ICONV_H
     1.8 +#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
     1.9  # include <iconv.h>
    1.10  #endif
    1.11  
    1.12 @@ -735,7 +735,7 @@
    1.13  #define SDL_ICONV_EILSEQ	(size_t)-3
    1.14  #define SDL_ICONV_EINVAL	(size_t)-4
    1.15  
    1.16 -#ifdef HAVE_ICONV_H
    1.17 +#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
    1.18  #define SDL_iconv_t     iconv_t
    1.19  #define SDL_iconv_open  iconv_open
    1.20  #define SDL_iconv_close iconv_close