summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorstopiccot <alexey.petruchik@gmail.com>2015-05-16 16:00:45 +0300
committerRalph Giles <giles@mozilla.com>2015-05-19 14:27:33 -0700
commit15fe47a80f7b0200c7654464ac04d002b8eb6bc3 (patch)
tree5f619fff3e641a51e9bff8d5ad410e5d8c12d21b /include
parentd92d71307d1e38a7fc33cd19f9d0965d4272256c (diff)
downloadogg-git-15fe47a80f7b0200c7654464ac04d002b8eb6bc3.tar.gz
Use stdint.h for Visual Studio 2013 and newer
Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
Diffstat (limited to 'include')
-rw-r--r--include/ogg/os_types.h22
1 files changed, 16 insertions, 6 deletions
diff --git a/include/ogg/os_types.h b/include/ogg/os_types.h
index 446ca32..af44058 100644
--- a/include/ogg/os_types.h
+++ b/include/ogg/os_types.h
@@ -49,12 +49,22 @@
typedef short ogg_int16_t;
typedef unsigned short ogg_uint16_t;
# else
- /* MSVC/Borland */
- typedef __int64 ogg_int64_t;
- typedef __int32 ogg_int32_t;
- typedef unsigned __int32 ogg_uint32_t;
- typedef __int16 ogg_int16_t;
- typedef unsigned __int16 ogg_uint16_t;
+# if defined(_MSC_VER) && (_MSC_VER >= 1800) /* MSVC 2013 and newer */
+# include <stdint.h>
+ typedef int16_t ogg_int16_t;
+ typedef uint16_t ogg_uint16_t;
+ typedef int32_t ogg_int32_t;
+ typedef uint32_t ogg_uint32_t;
+ typedef int64_t ogg_int64_t;
+ typedef uint64_t ogg_uint64_t;
+# else
+ /* MSVC/Borland */
+ typedef __int64 ogg_int64_t;
+ typedef __int32 ogg_int32_t;
+ typedef unsigned __int32 ogg_uint32_t;
+ typedef __int16 ogg_int16_t;
+ typedef unsigned __int16 ogg_uint16_t;
+# endif
# endif
#elif defined(__MACOS__)