encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Sam Lantinga 2016-10-07 16:44:42 -07:00
parent 7d2108ce81
commit 73f2c5413d
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/SDL_stdinc.h
View File

@ -83,9 +83,6 @@
#ifdef HAVE_FLOAT_H #ifdef HAVE_FLOAT_H
# include <float.h> # include <float.h>
#endif #endif
#if defined(HAVE_ICONV) && defined(HAVE_ICONV_H)
# include <iconv.h>
#endif
/** /**
* The number of elements in an array. * The number of elements in an array.

1
src/stdlib/SDL_iconv.c
View File

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