diff --git a/include/ogg/codec.h b/include/ogg/codec.h index db9434f..dd2f1c6 100644 --- a/include/ogg/codec.h +++ b/include/ogg/codec.h @@ -6,12 +6,11 @@ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001 * - * by the Xiph.Org Foundation http://www.xiph.org/ * + * by the Xiph.Org Foundation https://xiph.org/ * ******************************************************************** function: libvorbis codec headers - last mod: $Id: codec.h 17021 2010-03-24 09:29:41Z xiphmont $ ********************************************************************/ diff --git a/include/ogg/ogg.h b/include/ogg/ogg.h index d90297d..4c94b9e 100644 --- a/include/ogg/ogg.h +++ b/include/ogg/ogg.h @@ -11,7 +11,6 @@ ******************************************************************** function: toplevel libogg include - last mod: $Id$ ********************************************************************/ #ifndef _OGG_H diff --git a/include/ogg/os_types.h b/include/ogg/os_types.h index b8f5630..eb8a322 100644 --- a/include/ogg/os_types.h +++ b/include/ogg/os_types.h @@ -10,8 +10,7 @@ * * ******************************************************************** - function: #ifdef jail to whip a few platforms into the UNIX ideal. - last mod: $Id$ + function: Define a consistent set of types on each platform. ********************************************************************/ #ifndef _OS_TYPES_H @@ -44,6 +43,7 @@ typedef unsigned long long ogg_uint64_t; # elif defined(__MWERKS__) typedef long long ogg_int64_t; + typedef unsigned long long ogg_uint64_t; typedef int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef short ogg_int16_t; @@ -62,6 +62,7 @@ typedef __int64 ogg_int64_t; typedef __int32 ogg_int32_t; typedef unsigned __int32 ogg_uint32_t; + typedef unsigned __int64 ogg_uint64_t; typedef __int16 ogg_int16_t; typedef unsigned __int16 ogg_uint16_t; # endif @@ -69,12 +70,13 @@ #elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */ -# include +# include 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; #elif defined(__HAIKU__) @@ -85,6 +87,7 @@ typedef int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef long long ogg_int64_t; + typedef unsigned long long ogg_uint64_t; #elif defined(__BEOS__) @@ -95,6 +98,7 @@ typedef int32_t ogg_int32_t; typedef uint32_t ogg_uint32_t; typedef int64_t ogg_int64_t; + typedef uint64_t ogg_uint64_t; #elif defined (__EMX__) @@ -104,6 +108,8 @@ typedef int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef long long ogg_int64_t; + typedef unsigned long long ogg_uint64_t; + #elif defined (DJGPP) @@ -112,11 +118,13 @@ typedef int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef long long ogg_int64_t; + typedef unsigned long long ogg_uint64_t; #elif defined(R5900) /* PS2 EE */ typedef long ogg_int64_t; + typedef unsigned long ogg_uint64_t; typedef int ogg_int32_t; typedef unsigned ogg_uint32_t; typedef short ogg_int16_t; @@ -129,6 +137,7 @@ typedef signed int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef long long int ogg_int64_t; + typedef unsigned long long int ogg_uint64_t; #elif defined(__TMS320C6X__) @@ -138,6 +147,7 @@ typedef signed int ogg_int32_t; typedef unsigned int ogg_uint32_t; typedef long long int ogg_int64_t; + typedef unsigned long long int ogg_uint64_t; #else diff --git a/include/ogg/vorbisfile.h b/include/ogg/vorbisfile.h index 9271331..3d65393 100644 --- a/include/ogg/vorbisfile.h +++ b/include/ogg/vorbisfile.h @@ -6,12 +6,11 @@ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. * * * * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007 * - * by the Xiph.Org Foundation http://www.xiph.org/ * + * by the Xiph.Org Foundation https://xiph.org/ * * * ******************************************************************** function: stdio-based convenience library for opening/seeking/decoding - last mod: $Id: vorbisfile.h 17182 2010-04-29 03:48:32Z xiphmont $ ********************************************************************/ diff --git a/win32/lib/libogg_d.lib b/win32/lib/libogg_d.lib index 10a291b..0842e55 100644 Binary files a/win32/lib/libogg_d.lib and b/win32/lib/libogg_d.lib differ diff --git a/win32/lib/libogg_r.lib b/win32/lib/libogg_r.lib index 456713a..afc3561 100644 Binary files a/win32/lib/libogg_r.lib and b/win32/lib/libogg_r.lib differ diff --git a/win32/lib/libvorbisfile_d.lib b/win32/lib/libvorbisfile_d.lib index 21e37f5..322f7d3 100644 Binary files a/win32/lib/libvorbisfile_d.lib and b/win32/lib/libvorbisfile_d.lib differ diff --git a/win32/lib/libvorbisfile_r.lib b/win32/lib/libvorbisfile_r.lib index 2af09df..37fb6a4 100644 Binary files a/win32/lib/libvorbisfile_r.lib and b/win32/lib/libvorbisfile_r.lib differ diff --git a/win32/lib/x64/libogg_x64_d.lib b/win32/lib/x64/libogg_x64_d.lib index acc5226..aa237d6 100644 Binary files a/win32/lib/x64/libogg_x64_d.lib and b/win32/lib/x64/libogg_x64_d.lib differ diff --git a/win32/lib/x64/libogg_x64_r.lib b/win32/lib/x64/libogg_x64_r.lib index 92e7e91..66e9866 100644 Binary files a/win32/lib/x64/libogg_x64_r.lib and b/win32/lib/x64/libogg_x64_r.lib differ diff --git a/win32/lib/x64/libvorbisfile_x64_d.lib b/win32/lib/x64/libvorbisfile_x64_d.lib index 9c456cc..db30aaf 100644 Binary files a/win32/lib/x64/libvorbisfile_x64_d.lib and b/win32/lib/x64/libvorbisfile_x64_d.lib differ diff --git a/win32/lib/x64/libvorbisfile_x64_r.lib b/win32/lib/x64/libvorbisfile_x64_r.lib index 813f3bb..ceacb56 100644 Binary files a/win32/lib/x64/libvorbisfile_x64_r.lib and b/win32/lib/x64/libvorbisfile_x64_r.lib differ