Define EMULATE_INTTYPES for all windows-systems, except Cygwin and MinGW

to simplify usage on Windows.
patch by Fredrik Orderud fredrik - . - orderud - @ - idi - . - ntnu - . - no

Originally committed as revision 4736 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 2b388ee88967bdf3319f66b29f716f0a335d96f9..d83c672ea5a14de89f5c3e17b5cd3b1ea11f6723 100644 (file)
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -1015,14 +1015,7 @@ from the tree view, then add the files @file{avformat.lib},
 Dependencies". Note that the names of the libraries have to be separated
 using spaces.
 
-@item Now, select "C/C++ / Preprocessor" from the tree view. Select "Debug"
-in the "Configuration" combo box. Add @code{EMULATE_INTTYPES} to the
-"Preprocessor Definitions". (Note that the various preprocessor
-definitions have to be separated using semicolons.) Select "Release" in
-the "Configuration" combo box and, again, add @code{EMULATE_INTTYPES} to
-the "Preprocessor Definitions". (This has to be done separately because
-debug and release builds have different preprocessor definitions.)
-Finally, select "C/C++ / Code Generation" from the tree view. Select
+@item Now, select "C/C++ / Code Generation" from the tree view. Select
 "Debug" in the "Configuration" combo box. Make sure that "Runtime
 Library" is set to "Multi-threaded Debug DLL". Then, select "Release" in
 the "Configuration" combo box and make sure that "Runtime Library" is

diff --git a/libavutil/common.h b/libavutil/common.h
index a1c5927a229e3b73334282bd2f6ff3f6022a4cd6..20cabaf5b583f2d509c416f6fcb019b3602f32b4 100644 (file)
--- a/libavutil/common.h
+++ b/libavutil/common.h
@@ -10,6 +10,10 @@
 #    define CONFIG_WIN32
 #endif
 
+#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(EMULATE_INTTYPES)
+#    define EMULATE_INTTYPES
+#endif
+
 #ifndef M_PI
 #define M_PI    3.14159265358979323846
 #endif