Fixed bug 2885 - SDL_stdinc.h doesn't need to include iconv.h

Ryan C. Gordon We still include iconv.h in SDL_stdinc.h, probably because this header might have referenced the native iconv functions and types directly. Since these are hidden behind a stable ABI now and never just a #define for the system iconv, we shouldn't need this header included from a public SDL header anymore, slowing down external apps compiles and pulling tons of stuff into the namespace.
libsdl-org · Oct 7, 2016 · 73f2c54 · 73f2c54
1 parent 7d2108c
commit 73f2c54
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/include/SDL_stdinc.h b/include/SDL_stdinc.h
@@ -83,9 +83,6 @@
 #ifdef HAVE_FLOAT_H
 # include <float.h>
 #endif
-#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
-# include <iconv.h>
-#endif
 
 /**
  *  The number of elements in an array.

diff --git a/src/stdlib/SDL_iconv.c b/src/stdlib/SDL_iconv.c
@@ -31,6 +31,7 @@
 #include "SDL_endian.h"
 
 #ifdef HAVE_ICONV
+#include <iconv.h>
 
 /* Depending on which standard the iconv() was implemented with,
    iconv() may or may not use const char ** for the inbuf param.