diff --git a/MacOSX/codecs/include/ogg/config_types.h b/MacOSX/codecs/include/ogg/config_types.h index 1e7d4909..4b00047a 100644 --- a/MacOSX/codecs/include/ogg/config_types.h +++ b/MacOSX/codecs/include/ogg/config_types.h @@ -16,10 +16,10 @@ # include #endif -typedef short ogg_int16_t; -typedef unsigned short ogg_uint16_t; -typedef int ogg_int32_t; -typedef unsigned int ogg_uint32_t; -typedef long long ogg_int64_t; +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; #endif diff --git a/MacOSX/codecs/include/ogg/os_types.h b/MacOSX/codecs/include/ogg/os_types.h index d6691b70..8bf82107 100644 --- a/MacOSX/codecs/include/ogg/os_types.h +++ b/MacOSX/codecs/include/ogg/os_types.h @@ -11,7 +11,7 @@ ******************************************************************** function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id: os_types.h 17712 2010-12-03 17:10:02Z xiphmont $ + last mod: $Id: os_types.h 19098 2014-02-26 19:06:45Z giles $ ********************************************************************/ #ifndef _OS_TYPES_H @@ -24,7 +24,7 @@ #define _ogg_realloc realloc #define _ogg_free free -#if defined(_WIN32) +#if defined(_WIN32) # if defined(__CYGWIN__) # include diff --git a/MacOSX/codecs/lib/libogg.dylib b/MacOSX/codecs/lib/libogg.dylib index 60e4f51d..fc0a6587 100755 Binary files a/MacOSX/codecs/lib/libogg.dylib and b/MacOSX/codecs/lib/libogg.dylib differ diff --git a/MacOSX/codecs/lib/libvorbis.dylib b/MacOSX/codecs/lib/libvorbis.dylib index ea5385c3..6ccfe963 100755 Binary files a/MacOSX/codecs/lib/libvorbis.dylib and b/MacOSX/codecs/lib/libvorbis.dylib differ diff --git a/MacOSX/codecs/lib/libvorbisfile.dylib b/MacOSX/codecs/lib/libvorbisfile.dylib index eff6bd0d..ea31f007 100755 Binary files a/MacOSX/codecs/lib/libvorbisfile.dylib and b/MacOSX/codecs/lib/libvorbisfile.dylib differ diff --git a/Windows/codecs/include/ogg/config_types.h b/Windows/codecs/include/ogg/config_types.h index dbb52d56..8f8318fb 100644 --- a/Windows/codecs/include/ogg/config_types.h +++ b/Windows/codecs/include/ogg/config_types.h @@ -2,10 +2,8 @@ #define __CONFIG_TYPES_H__ /* these are filled in by configure */ -#ifndef _MSC_VER -#define INCLUDE_INTTYPES_H 1 -#define INCLUDE_STDINT_H 1 -#endif /* !MSVC */ +#define INCLUDE_INTTYPES_H 0 +#define INCLUDE_STDINT_H 0 #define INCLUDE_SYS_TYPES_H 1 #if INCLUDE_INTTYPES_H diff --git a/Windows/codecs/include/ogg/os_types.h b/Windows/codecs/include/ogg/os_types.h index d6691b70..8bf82107 100644 --- a/Windows/codecs/include/ogg/os_types.h +++ b/Windows/codecs/include/ogg/os_types.h @@ -11,7 +11,7 @@ ******************************************************************** function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id: os_types.h 17712 2010-12-03 17:10:02Z xiphmont $ + last mod: $Id: os_types.h 19098 2014-02-26 19:06:45Z giles $ ********************************************************************/ #ifndef _OS_TYPES_H @@ -24,7 +24,7 @@ #define _ogg_realloc realloc #define _ogg_free free -#if defined(_WIN32) +#if defined(_WIN32) # if defined(__CYGWIN__) # include diff --git a/Windows/codecs/x64/libogg-0.dll b/Windows/codecs/x64/libogg-0.dll index fd208525..5f3cfc39 100644 Binary files a/Windows/codecs/x64/libogg-0.dll and b/Windows/codecs/x64/libogg-0.dll differ diff --git a/Windows/codecs/x64/libvorbis-0.dll b/Windows/codecs/x64/libvorbis-0.dll index 0ffaf73b..53a1713c 100644 Binary files a/Windows/codecs/x64/libvorbis-0.dll and b/Windows/codecs/x64/libvorbis-0.dll differ diff --git a/Windows/codecs/x64/libvorbisfile-3.dll b/Windows/codecs/x64/libvorbisfile-3.dll index fd15ead8..5b5f3e35 100644 Binary files a/Windows/codecs/x64/libvorbisfile-3.dll and b/Windows/codecs/x64/libvorbisfile-3.dll differ diff --git a/Windows/codecs/x86/libogg-0.dll b/Windows/codecs/x86/libogg-0.dll index d56d5faa..1fc02398 100644 Binary files a/Windows/codecs/x86/libogg-0.dll and b/Windows/codecs/x86/libogg-0.dll differ diff --git a/Windows/codecs/x86/libvorbis-0.dll b/Windows/codecs/x86/libvorbis-0.dll index 4c3f5277..582296fa 100644 Binary files a/Windows/codecs/x86/libvorbis-0.dll and b/Windows/codecs/x86/libvorbis-0.dll differ diff --git a/Windows/codecs/x86/libvorbisfile-3.dll b/Windows/codecs/x86/libvorbisfile-3.dll index 6f1f1fde..2112efea 100644 Binary files a/Windows/codecs/x86/libvorbisfile-3.dll and b/Windows/codecs/x86/libvorbisfile-3.dll differ