Upgrade to SDL 2.0.5.

[xonotic/xonotic.git] / misc / builddeps / win32 / sdl / include / SDL2 / SDL_stdinc.h

diff --git a/misc/builddeps/win32/sdl/include/SDL2/SDL_stdinc.h b/misc/builddeps/win32/sdl/include/SDL2/SDL_stdinc.h
index 887bcd2d46281cb5724649155fc3c6fccf769368..fdf96415fa1453c8f6014486e0a9add313f03f30 100644 (file)
--- a/misc/builddeps/win32/sdl/include/SDL2/SDL_stdinc.h
+++ b/misc/builddeps/win32/sdl/include/SDL2/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.
@@ -93,6 +90,13 @@
 #define SDL_arraysize(array)    (sizeof(array)/sizeof(array[0]))
 #define SDL_TABLESIZE(table)    SDL_arraysize(table)
 
+/**
+ *  Macro useful for building other macros with strings in them
+ *
+ *  e.g. #define LOG_ERROR(X) OutputDebugString(SDL_STRINGIFY_ARG(__FUNCTION__) ": " X "\n")
+ */
+#define SDL_STRINGIFY_ARG(arg)  #arg
+
 /**
  *  \name Cast operators
  *