From fe054fb6f86f4d0ef15287a4e47a6eabd215efe7 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Wed, 31 Mar 2021 14:56:50 +0300
Subject: [PATCH] external libs: updates to libvorbisidec.
---
external/libvorbisidec-1.2.1.patch | 2 +-
external/libvorbisidec-1.2.1/Android.mk | 2 +-
external/libvorbisidec-1.2.1/Makefile.am | 32 +++----
external/libvorbisidec-1.2.1/Makefile.in | 32 +++----
.../libvorbisidec-1.2.1/Version_script.in | 2 +-
external/libvorbisidec-1.2.1/codebook.c | 3 +-
external/libvorbisidec-1.2.1/configure | 89 ++++++-------------
external/libvorbisidec-1.2.1/configure.ac | 15 +++-
external/libvorbisidec-1.2.1/floor0.c | 2 -
external/libvorbisidec-1.2.1/floor1.c | 1 -
external/libvorbisidec-1.2.1/info.c | 2 +-
.../libvorbisidec-1.2.1/iseeking_example.c | 14 ---
external/libvorbisidec-1.2.1/ivorbisfile.h | 7 +-
external/libvorbisidec-1.2.1/mapping0.c | 1 -
external/libvorbisidec-1.2.1/misc.h | 6 +-
external/libvorbisidec-1.2.1/os.h | 1 -
external/libvorbisidec-1.2.1/res012.c | 1 -
external/libvorbisidec-1.2.1/sharedbook.c | 2 -
external/libvorbisidec-1.2.1/vorbisfile.c | 1 -
external/libvorbisidec-1.2.1/window.c | 1 -
20 files changed, 80 insertions(+), 136 deletions(-)
diff --git a/external/libvorbisidec-1.2.1.patch b/external/libvorbisidec-1.2.1.patch
index 80a4f9c..11a77d8 100644
--- a/external/libvorbisidec-1.2.1.patch
+++ b/external/libvorbisidec-1.2.1.patch
@@ -10,7 +10,7 @@ diff -u /dev/null libvorbisidec-1.2.1/Android.mk
+
+LOCAL_C_INCLUDES :=
+
-+LOCAL_CFLAGS := -DHAVE_ALLOCA -DVAR_ARRAYS
++LOCAL_CFLAGS := -DHAVE_ALLOCA -DVAR_ARRAYS -DHAVE_SYS_TYPES_H
+
+ifeq ($(TARGET_ARCH),arm)
+ LOCAL_CFLAGS += -D_ARM_ASSEM_
diff --git a/external/libvorbisidec-1.2.1/Android.mk b/external/libvorbisidec-1.2.1/Android.mk
index 765514e..55af63f 100644
--- a/external/libvorbisidec-1.2.1/Android.mk
+++ b/external/libvorbisidec-1.2.1/Android.mk
@@ -6,7 +6,7 @@ LOCAL_MODULE := vorbisidec
LOCAL_C_INCLUDES :=
-LOCAL_CFLAGS := -DHAVE_ALLOCA -DVAR_ARRAYS
+LOCAL_CFLAGS := -DHAVE_ALLOCA -DVAR_ARRAYS -DHAVE_SYS_TYPES_H
ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += -D_ARM_ASSEM_
diff --git a/external/libvorbisidec-1.2.1/Makefile.am b/external/libvorbisidec-1.2.1/Makefile.am
index f506adf..f9b8532 100644
--- a/external/libvorbisidec-1.2.1/Makefile.am
+++ b/external/libvorbisidec-1.2.1/Makefile.am
@@ -9,15 +9,15 @@ pkgconfig_DATA = vorbisidec.pc
lib_LTLIBRARIES = libvorbisidec.la
libvorbisidec_la_SOURCES = mdct.c block.c window.c \
- synthesis.c info.c \
- floor1.c floor0.c vorbisfile.c \
- res012.c mapping0.c registry.c codebook.c \
- sharedbook.c \
- codebook.h misc.h mdct_lookup.h\
- os.h mdct.h block.h ivorbisfile.h lsp_lookup.h\
- registry.h window.h window_lookup.h\
- codec_internal.h backends.h \
- asm_arm.h ivorbiscodec.h
+ synthesis.c info.c \
+ floor1.c floor0.c vorbisfile.c \
+ res012.c mapping0.c registry.c codebook.c \
+ sharedbook.c \
+ codebook.h misc.h mdct_lookup.h \
+ os.h mdct.h block.h ivorbisfile.h lsp_lookup.h \
+ registry.h window.h window_lookup.h \
+ codec_internal.h backends.h \
+ asm_arm.h ivorbiscodec.h
libvorbisidec_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ $(SHLIB_VERSION_ARG)
libvorbisidec_la_LIBADD = @OGG_LIBS@
@@ -25,27 +25,29 @@ EXTRA_PROGRAMS = ivorbisfile_example iseeking_example
CLEANFILES = $(EXTRA_PROGRAMS) $(lib_LTLIBRARIES)
ivorbisfile_example_SOURCES = ivorbisfile_example.c
-ivorbisfile_example_LDFLAGS = -static
+ivorbisfile_example_LDFLAGS = -static
ivorbisfile_example_LDADD = libvorbisidec.la @OGG_LIBS@
iseeking_example_SOURCES = iseeking_example.c
-iseeking_example_LDFLAGS = -static
+iseeking_example_LDFLAGS = -static
iseeking_example_LDADD = libvorbisidec.la @OGG_LIBS@
includedir = $(prefix)/include/tremor
include_HEADERS = ivorbiscodec.h ivorbisfile.h config_types.h
-EXTRA_DIST = vorbisidec.pc.in \
- $(srcdir)/doc/*.html $(srcdir)/win32/VS*/libtremor/*.vcproj
+EXTRA_DIST = vorbisidec.pc.in \
+ $(srcdir)/win32/VS2005 \
+ $(srcdir)/win32/VS2008 \
+ $(srcdir)/doc/*.html \
+ $(srcdir)/doc/style.css
example:
- -ln -fs . vorbis
$(MAKE) ivorbisfile_example
$(MAKE) iseeking_example
debug:
- $(MAKE) all CFLAGS="@DEBUG@"
+ $(MAKE) all CFLAGS="@DEBUG@"
profile:
$(MAKE) all CFLAGS="@PROFILE@"
diff --git a/external/libvorbisidec-1.2.1/Makefile.in b/external/libvorbisidec-1.2.1/Makefile.in
index 5264cdc..5b3be5b 100644
--- a/external/libvorbisidec-1.2.1/Makefile.in
+++ b/external/libvorbisidec-1.2.1/Makefile.in
@@ -406,28 +406,31 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = vorbisidec.pc
lib_LTLIBRARIES = libvorbisidec.la
libvorbisidec_la_SOURCES = mdct.c block.c window.c \
- synthesis.c info.c \
- floor1.c floor0.c vorbisfile.c \
- res012.c mapping0.c registry.c codebook.c \
- sharedbook.c \
- codebook.h misc.h mdct_lookup.h\
- os.h mdct.h block.h ivorbisfile.h lsp_lookup.h\
- registry.h window.h window_lookup.h\
- codec_internal.h backends.h \
- asm_arm.h ivorbiscodec.h
+ synthesis.c info.c \
+ floor1.c floor0.c vorbisfile.c \
+ res012.c mapping0.c registry.c codebook.c \
+ sharedbook.c \
+ codebook.h misc.h mdct_lookup.h \
+ os.h mdct.h block.h ivorbisfile.h lsp_lookup.h \
+ registry.h window.h window_lookup.h \
+ codec_internal.h backends.h \
+ asm_arm.h ivorbiscodec.h
libvorbisidec_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@ $(SHLIB_VERSION_ARG)
libvorbisidec_la_LIBADD = @OGG_LIBS@
CLEANFILES = $(EXTRA_PROGRAMS) $(lib_LTLIBRARIES)
ivorbisfile_example_SOURCES = ivorbisfile_example.c
-ivorbisfile_example_LDFLAGS = -static
+ivorbisfile_example_LDFLAGS = -static
ivorbisfile_example_LDADD = libvorbisidec.la @OGG_LIBS@
iseeking_example_SOURCES = iseeking_example.c
-iseeking_example_LDFLAGS = -static
+iseeking_example_LDFLAGS = -static
iseeking_example_LDADD = libvorbisidec.la @OGG_LIBS@
include_HEADERS = ivorbiscodec.h ivorbisfile.h config_types.h
-EXTRA_DIST = vorbisidec.pc.in \
- $(srcdir)/doc/*.html $(srcdir)/win32/VS*/libtremor/*.vcproj
+EXTRA_DIST = vorbisidec.pc.in \
+ $(srcdir)/win32/VS2005 \
+ $(srcdir)/win32/VS2008 \
+ $(srcdir)/doc/*.html \
+ $(srcdir)/doc/style.css
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -1031,12 +1034,11 @@ uninstall-am: uninstall-includeHEADERS uninstall-libLTLIBRARIES \
example:
- -ln -fs . vorbis
$(MAKE) ivorbisfile_example
$(MAKE) iseeking_example
debug:
- $(MAKE) all CFLAGS="@DEBUG@"
+ $(MAKE) all CFLAGS="@DEBUG@"
profile:
$(MAKE) all CFLAGS="@PROFILE@"
diff --git a/external/libvorbisidec-1.2.1/Version_script.in b/external/libvorbisidec-1.2.1/Version_script.in
index 1a4d6d7..8b7b686 100644
--- a/external/libvorbisidec-1.2.1/Version_script.in
+++ b/external/libvorbisidec-1.2.1/Version_script.in
@@ -1,4 +1,3 @@
-#
# Export file for libvorbisidec
#
# Only the symbols listed in the global section will be callable from
@@ -9,6 +8,7 @@
{
global:
ov_clear;
+ ov_fopen;
ov_open;
ov_open_callbacks;
ov_test;
diff --git a/external/libvorbisidec-1.2.1/codebook.c b/external/libvorbisidec-1.2.1/codebook.c
index 1bbba8f..c0a06ec 100644
--- a/external/libvorbisidec-1.2.1/codebook.c
+++ b/external/libvorbisidec-1.2.1/codebook.c
@@ -17,7 +17,6 @@
#include <stdlib.h>
#include <string.h>
-#include <math.h>
#include <ogg/ogg.h>
#include "ivorbiscodec.h"
#include "codebook.h"
@@ -168,7 +167,7 @@ STIN long decode_packed_entry_number(codebook *book,
int read=book->dec_maxlength;
long lo,hi;
long lok = oggpack_look(b,book->dec_firsttablen);
-
+
if (lok >= 0) {
long entry = book->dec_firsttable[lok];
if(entry&0x80000000UL){
diff --git a/external/libvorbisidec-1.2.1/configure b/external/libvorbisidec-1.2.1/configure
index dc013dd..e1ecaf6 100755
--- a/external/libvorbisidec-1.2.1/configure
+++ b/external/libvorbisidec-1.2.1/configure
@@ -632,10 +632,10 @@ ac_includes_default="\
ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
+LIBOBJS
PROFILE
DEBUG
SHLIB_VERSION_ARG
-LIBOBJS
ALLOCA
OGG_LIBS
OGG_CFLAGS
@@ -782,6 +782,7 @@ with_gnu_ld
with_sysroot
enable_libtool_lock
enable_low_accuracy
+enable_alloca
with_ogg
with_ogg_libraries
with_ogg_includes
@@ -1445,6 +1446,7 @@ Optional Features:
optimize for fast installation [default=yes]
--disable-libtool-lock avoid locking (might break parallel builds)
--enable-low-accuracy enable 32 bit only multiply operations
+ --disable-alloca disable alloca and only use variable-length arrays
--disable-oggtest Do not try to compile and run a test Ogg program
Optional Packages:
@@ -12804,6 +12806,27 @@ if test "${enable_low_accuracy+set}" = set; then :
fi
+# Check whether --enable-alloca was given.
+if test "${enable_alloca+set}" = set; then :
+ enableval=$enable_alloca;
+else
+ enable_alloca=yes
+
+fi
+
+
+
+for ac_header in sys/types.h
+do :
+ ac_fn_c_check_header_mongrel "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_types_h" = xyes; then :
+ cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_TYPES_H 1
+_ACEOF
+
+fi
+
+done
ac_fn_c_check_header_mongrel "$LINENO" "memory.h" "ac_cv_header_memory_h" "$ac_includes_default"
if test "x$ac_cv_header_memory_h" = xyes; then :
@@ -13191,7 +13214,8 @@ fi
fi
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$enable_alloca" = "xyes"; then
+ ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
if test "x$ac_cv_type_size_t" = xyes; then :
else
@@ -13389,68 +13413,7 @@ _ACEOF
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
-$as_echo_n "checking for working memcmp... " >&6; }
-if ${ac_cv_func_memcmp_working+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "$cross_compiling" = yes; then :
- ac_cv_func_memcmp_working=no
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-$ac_includes_default
-int
-main (void)
-{
-
- /* Some versions of memcmp are not 8-bit clean. */
- char c0 = '\100', c1 = '\200', c2 = '\201';
- if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
- return 1;
-
- /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
- or more and with at least one buffer not starting on a 4-byte boundary.
- William Lewis provided this test program. */
- {
- char foo[21];
- char bar[21];
- int i;
- for (i = 0; i < 4; i++)
- {
- char *a = foo + i;
- char *b = bar + i;
- strcpy (a, "--------01111111");
- strcpy (b, "--------10000000");
- if (memcmp (a, b, 16) >= 0)
- return 1;
- }
- return 0;
- }
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
- ac_cv_func_memcmp_working=yes
-else
- ac_cv_func_memcmp_working=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
-$as_echo "$ac_cv_func_memcmp_working" >&6; }
-test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
- *" memcmp.$ac_objext "* ) ;;
- *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
- ;;
-esac
-
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C99 variable-size arrays" >&5
$as_echo_n "checking for C99 variable-size arrays... " >&6; }
diff --git a/external/libvorbisidec-1.2.1/configure.ac b/external/libvorbisidec-1.2.1/configure.ac
index a2276a1..6511f7f 100644
--- a/external/libvorbisidec-1.2.1/configure.ac
+++ b/external/libvorbisidec-1.2.1/configure.ac
@@ -93,14 +93,20 @@ dnl Options
dnl --------------------------------------------------
AC_ARG_ENABLE(low-accuracy,
- AS_HELP_STRING([--enable-low-accuracy], [enable 32 bit only multiply operations]),
+ [AS_HELP_STRING([--enable-low-accuracy], [enable 32 bit only multiply operations])],
CFLAGS="$CFLAGS -D_LOW_ACCURACY_"
)
+AC_ARG_ENABLE(alloca,
+ [AS_HELP_STRING([--disable-alloca], [disable alloca and only use variable-length arrays])],,
+ [enable_alloca=yes]
+)
+
dnl --------------------------------------------------
dnl Check for headers
dnl --------------------------------------------------
+AC_CHECK_HEADERS(sys/types.h)
AC_CHECK_HEADER(memory.h,CFLAGS="$CFLAGS -DUSE_MEMORY_H",:)
dnl --------------------------------------------------
@@ -131,11 +137,12 @@ then
fi
dnl --------------------------------------------------
-dnl Check for library functions
+dnl Stack allocation mode
dnl --------------------------------------------------
-AC_FUNC_ALLOCA
-AC_FUNC_MEMCMP
+if test "x$enable_alloca" = "xyes"; then
+ AC_FUNC_ALLOCA
+fi
AC_MSG_CHECKING(for C99 variable-size arrays)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
diff --git a/external/libvorbisidec-1.2.1/floor0.c b/external/libvorbisidec-1.2.1/floor0.c
index 3380df4..c73955d 100644
--- a/external/libvorbisidec-1.2.1/floor0.c
+++ b/external/libvorbisidec-1.2.1/floor0.c
@@ -17,7 +17,6 @@
#include <stdlib.h>
#include <string.h>
-#include <math.h>
#include <ogg/ogg.h>
#include "ivorbiscodec.h"
#include "codec_internal.h"
@@ -436,4 +435,3 @@ vorbis_func_floor floor0_exportbundle={
&floor0_free_look,&floor0_inverse1,&floor0_inverse2
};
-
diff --git a/external/libvorbisidec-1.2.1/floor1.c b/external/libvorbisidec-1.2.1/floor1.c
index e63ae9f..cecc5d5 100644
--- a/external/libvorbisidec-1.2.1/floor1.c
+++ b/external/libvorbisidec-1.2.1/floor1.c
@@ -17,7 +17,6 @@
#include <stdlib.h>
#include <string.h>
-#include <math.h>
#include <ogg/ogg.h>
#include "ivorbiscodec.h"
#include "codec_internal.h"
diff --git a/external/libvorbisidec-1.2.1/info.c b/external/libvorbisidec-1.2.1/info.c
index dd5b7ad..469b482 100644
--- a/external/libvorbisidec-1.2.1/info.c
+++ b/external/libvorbisidec-1.2.1/info.c
@@ -36,7 +36,7 @@ static void _v_readstring(oggpack_buffer *o,char *buf,int bytes){
}
}
-static int _v_toupper(int c) {
+STIN int _v_toupper(int c) {
return (c >= 'a' && c <= 'z') ? (c & ~('a' - 'A')) : c;
}
diff --git a/external/libvorbisidec-1.2.1/iseeking_example.c b/external/libvorbisidec-1.2.1/iseeking_example.c
index dc971ba..3e0e1a3 100644
--- a/external/libvorbisidec-1.2.1/iseeking_example.c
+++ b/external/libvorbisidec-1.2.1/iseeking_example.c
@@ -12,7 +12,6 @@
********************************************************************
function: illustrate seeking, and test it too
- last mod: $Id$
********************************************************************/
@@ -250,16 +249,3 @@ int main(){
ov_clear(&ov);
return 0;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/external/libvorbisidec-1.2.1/ivorbisfile.h b/external/libvorbisidec-1.2.1/ivorbisfile.h
index f6ecb0e..cb82f9c 100644
--- a/external/libvorbisidec-1.2.1/ivorbisfile.h
+++ b/external/libvorbisidec-1.2.1/ivorbisfile.h
@@ -29,11 +29,11 @@ extern "C"
#define CHUNKSIZE 65535
#define READSIZE 1024
/* The function prototypes for the callbacks are basically the same as for
- * the stdio functions fread, fseek, fclose, ftell.
+ * the stdio functions fread, fseek, fclose, ftell.
* The one difference is that the FILE * arguments have been replaced with
* a void * - this is to be used as a pointer to whatever internal data these
* functions might need. In the stdio case, it's just a FILE * cast to a void *
- *
+ *
* If you use other functions, check the docs for these functions and return
* the right values. For seek_func(), you *MUST* return -1 if the stream is
* unseekable
@@ -87,6 +87,7 @@ typedef struct OggVorbis_File {
} OggVorbis_File;
extern int ov_clear(OggVorbis_File *vf);
+extern int ov_fopen(const char *path,OggVorbis_File *vf);
extern int ov_open(FILE *f,OggVorbis_File *vf,const char *initial,long ibytes);
extern int ov_open_callbacks(void *datasource, OggVorbis_File *vf,
const char *initial, long ibytes, ov_callbacks callbacks);
@@ -127,5 +128,3 @@ extern long ov_read(OggVorbis_File *vf,char *buffer,int length,
#endif /* __cplusplus */
#endif
-
-
diff --git a/external/libvorbisidec-1.2.1/mapping0.c b/external/libvorbisidec-1.2.1/mapping0.c
index 631ab90..f9b506f 100644
--- a/external/libvorbisidec-1.2.1/mapping0.c
+++ b/external/libvorbisidec-1.2.1/mapping0.c
@@ -18,7 +18,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <math.h>
#include <ogg/ogg.h>
#include "ivorbiscodec.h"
#include "mdct.h"
diff --git a/external/libvorbisidec-1.2.1/misc.h b/external/libvorbisidec-1.2.1/misc.h
index 77cb2e2..cdc646d 100644
--- a/external/libvorbisidec-1.2.1/misc.h
+++ b/external/libvorbisidec-1.2.1/misc.h
@@ -37,7 +37,7 @@
#ifndef _LOW_ACCURACY_
/* 64 bit multiply */
-#if !(defined WIN32 && defined WINCE)
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
@@ -239,7 +239,3 @@ STIN ogg_int32_t VFLOAT_ADD(ogg_int32_t a,ogg_int32_t ap,
}
#endif
-
-
-
-
diff --git a/external/libvorbisidec-1.2.1/os.h b/external/libvorbisidec-1.2.1/os.h
index fdf1422..0ace2f0 100644
--- a/external/libvorbisidec-1.2.1/os.h
+++ b/external/libvorbisidec-1.2.1/os.h
@@ -21,7 +21,6 @@
# include "config.h"
#endif
-#include <math.h>
#include <ogg/os_types.h>
#ifndef _V_IFDEFJAIL_H_
diff --git a/external/libvorbisidec-1.2.1/res012.c b/external/libvorbisidec-1.2.1/res012.c
index 5afdf84..4e3a54b 100644
--- a/external/libvorbisidec-1.2.1/res012.c
+++ b/external/libvorbisidec-1.2.1/res012.c
@@ -17,7 +17,6 @@
#include <stdlib.h>
#include <string.h>
-#include <math.h>
#include <ogg/ogg.h>
#include "ivorbiscodec.h"
#include "codec_internal.h"
diff --git a/external/libvorbisidec-1.2.1/sharedbook.c b/external/libvorbisidec-1.2.1/sharedbook.c
index a35aef5..f436f21 100644
--- a/external/libvorbisidec-1.2.1/sharedbook.c
+++ b/external/libvorbisidec-1.2.1/sharedbook.c
@@ -16,7 +16,6 @@
********************************************************************/
#include <stdlib.h>
-#include <math.h>
#include <string.h>
#include <ogg/ogg.h>
#include "misc.h"
@@ -444,4 +443,3 @@ int vorbis_book_init_decode(codebook *c,const static_codebook *s){
vorbis_book_clear(c);
return(-1);
}
-
diff --git a/external/libvorbisidec-1.2.1/vorbisfile.c b/external/libvorbisidec-1.2.1/vorbisfile.c
index afb4f05..f21495b 100644
--- a/external/libvorbisidec-1.2.1/vorbisfile.c
+++ b/external/libvorbisidec-1.2.1/vorbisfile.c
@@ -20,7 +20,6 @@
#include <stdio.h>
#include <errno.h>
#include <string.h>
-#include <math.h>
#include "ivorbiscodec.h"
#include "ivorbisfile.h"
diff --git a/external/libvorbisidec-1.2.1/window.c b/external/libvorbisidec-1.2.1/window.c
index 3f2917f..80da7f3 100644
--- a/external/libvorbisidec-1.2.1/window.c
+++ b/external/libvorbisidec-1.2.1/window.c
@@ -16,7 +16,6 @@
********************************************************************/
#include <stdlib.h>
-#include <math.h>
#include "misc.h"
#include "window.h"
#include "window_lookup.h"