summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2017-01-19 06:30:45 +1100
committerErik de Castro Lopo <erikd@mega-nerd.com>2017-01-19 06:33:33 +1100
commit1e9e707c6f69ae8937975d3478d474229bcaf821 (patch)
tree8c16a65fb2beade5998aae7db562a143fc9d4401 /include
parent89a6c52067fadbcb18b54b85804a112196b46ce1 (diff)
downloadflac-1e9e707c6f69ae8937975d3478d474229bcaf821.tar.gz
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>
Diffstat (limited to 'include')
-rw-r--r--include/FLAC/ordinals.h17
-rw-r--r--include/share/Makefile.am1
-rw-r--r--include/share/compat.h8
3 files changed, 9 insertions, 17 deletions
diff --git a/include/FLAC/ordinals.h b/include/FLAC/ordinals.h
index 8018afec..75b830d6 100644
--- a/include/FLAC/ordinals.h
+++ b/include/FLAC/ordinals.h
@@ -39,15 +39,14 @@
* the 1999 ISO C Standard header file <stdint.h>.
*/
-typedef __int8 FLAC__int8;
-typedef uint32_t __int8 FLAC__uint8;
-
-typedef __int16 FLAC__int16;
-typedef __int32 FLAC__int32;
-typedef __int64 FLAC__int64;
-typedef uint32_t __int16 FLAC__uint16;
-typedef uint32_t __int32 FLAC__uint32;
-typedef uint32_t __int64 FLAC__uint64;
+typedef signed __int8 FLAC__int8;
+typedef signed __int16 FLAC__int16;
+typedef signed __int32 FLAC__int32;
+typedef signed __int64 FLAC__int64;
+typedef unsigned __int8 FLAC__uint8;
+typedef unsigned __int16 FLAC__uint16;
+typedef unsigned __int32 FLAC__uint32;
+typedef unsigned __int64 FLAC__uint64;
#else
diff --git a/include/share/Makefile.am b/include/share/Makefile.am
index 2d8ca503..079c1690 100644
--- a/include/share/Makefile.am
+++ b/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 \
diff --git a/include/share/compat.h b/include/share/compat.h
index 2083f3a2..94edbd21 100644
--- a/include/share/compat.h
+++ b/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"