Skip to content
Permalink
Browse files

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.
  • Loading branch information
slouken committed Oct 7, 2016
1 parent 7d2108c commit 73f2c5413d689c0b8cc958f90e55d7c3566d6684
Showing with 1 addition and 3 deletions.
  1. +0 −3 include/SDL_stdinc.h
  2. +1 −0 src/stdlib/SDL_iconv.c
@@ -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.
@@ -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.

0 comments on commit 73f2c54

Please sign in to comment.