stdint.h fixes for MSVS 2005/2008

This adds a new msvc2005_int.h header file which is "force included"
as needed by the MSVS project file.

Patch-from: lvqcl <lvqcl.mail@gmail.com>

examples/c/decode/file/example_c_decode_file.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

examples/c/encode/file/example_c_encode_file.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

examples/cpp/decode/file/example_cpp_decode_file.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

examples/cpp/encode/file/example_cpp_encode_file.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

include/FLAC/ordinals.h

@@ -39,15 +39,14 @@
  * the 1999 ISO C Standard header file <stdint.h>.
  */
 
-typedef __int8 FLAC__int8;
+typedef signed __int8 FLAC__int8;
-typedef uint32_t __int8 FLAC__uint8;
+typedef signed __int16 FLAC__int16;
-
+typedef signed __int32 FLAC__int32;
-typedef __int16 FLAC__int16;
+typedef signed __int64 FLAC__int64;
-typedef __int32 FLAC__int32;
+typedef unsigned __int8 FLAC__uint8;
-typedef __int64 FLAC__int64;
+typedef unsigned __int16 FLAC__uint16;
-typedef uint32_t __int16 FLAC__uint16;
+typedef unsigned __int32 FLAC__uint32;
-typedef uint32_t __int32 FLAC__uint32;
+typedef unsigned __int64 FLAC__uint64;
-typedef uint32_t __int64 FLAC__uint64;
 
 #else
 

include/share/Makefile.am

@@ -9,6 +9,7 @@ EXTRA_DIST = \
 	getopt.h \
 	grabbag.h \
 	macros.h \
+	msvc2005_int.h \
 	private.h \
 	replaygain_analysis.h \
 	replaygain_synthesis.h \

include/share/compat.h

@@ -130,14 +130,6 @@
 #    ifndef UINT32_MAX
 #      define UINT32_MAX _UI32_MAX
 #    endif
-     typedef unsigned __int64 uint64_t;
-     typedef unsigned __int32 uint32_t;
-     typedef unsigned __int16 uint16_t;
-     typedef unsigned __int8 uint8_t;
-     typedef __int64 int64_t;
-     typedef __int32 int32_t;
-     typedef __int16 int16_t;
-     typedef __int8  int8_t;
 #    define PRIu64 "I64u"
 #    define PRId64 "I64d"
 #    define PRIx64 "I64x"

src/flac/flac.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/flac/iffscan.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/libFLAC++/libFLAC++_dynamic.vcproj

@@ -49,6 +49,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -125,6 +126,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/libFLAC++/libFLAC++_static.vcproj

@@ -49,6 +49,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -115,6 +116,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/libFLAC/libFLAC_dynamic.vcproj

@@ -52,6 +52,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -132,6 +133,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/libFLAC/libFLAC_static.vcproj

@@ -52,6 +52,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -120,6 +121,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/metaflac/metaflac.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/share/getopt/getopt_static.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/share/grabbag/grabbag_static.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/share/replaygain_analysis/replaygain_analysis_static.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/share/replaygain_synthesis/replaygain_synthesis_static.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/share/utf8/utf8_static.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/share/win_utf8_io/win_utf8_io_static.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/test_grabbag/cuesheet/test_cuesheet.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -128,6 +129,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/test_grabbag/picture/test_picture.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -128,6 +129,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/test_libFLAC++/test_libFLAC++.vcproj

@@ -49,6 +49,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -127,6 +128,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/test_libFLAC/test_libFLAC.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/test_libs_common/test_libs_common_static.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -117,6 +118,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/test_seeking/test_seeking.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -129,6 +130,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/test_streams/test_streams.vcproj

@@ -50,6 +50,7 @@
 				DebugInformationFormat="4"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -128,6 +129,7 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/utils/flacdiff/flacdiff.vcproj

@@ -49,6 +49,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -127,6 +128,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"

src/utils/flactimer/flactimer.vcproj

@@ -49,6 +49,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -126,6 +127,7 @@
 				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="3"
 				DisableSpecificWarnings="4267;4996"
+				ForcedIncludeFiles="share/msvc2005_int.h"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"