resample: clean up, sync with opus-tools version

 - Do not define macros, functions, or variables with file scope using
   names beginning with an underscore (these names are reserved for the
   implementation; see C89 section 7.1.3 or any later version) or that
   shadow other global declarations
 - Avoid declarations after statements (speex_assert) for C89 compat
 - Silence unused parameter warning in resampler_basic_zero
 - No need for the stack_alloc.h macros within #ifdef VAR_ARRAYS; use
   the standard C syntax
 - When OUTSIDE_SPEEX, define EXPORT if not already defined
 - Update URL to https

4 files changed, 9 insertions, 9 deletions

diff --git a/win32/VS2003/libspeexdsp/libspeexdsp.vcproj b/win32/VS2003/libspeexdsp/libspeexdsp.vcproj
index 1fc21ad..833a255 100755
--- a/win32/VS2003/libspeexdsp/libspeexdsp.vcproj
+++ b/win32/VS2003/libspeexdsp/libspeexdsp.vcproj
@@ -120,7 +120,7 @@
 				FavorSizeOrSpeed="1"

 				OptimizeForProcessor="3"

 				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H"

+				PreprocessorDefinitions="USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H"

 				StringPooling="TRUE"

 				ExceptionHandling="FALSE"

 				RuntimeLibrary="0"

@@ -181,7 +181,7 @@
 				FavorSizeOrSpeed="1"

 				OptimizeForProcessor="3"

 				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H"

+				PreprocessorDefinitions="USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H"

 				StringPooling="TRUE"

 				ExceptionHandling="FALSE"

 				RuntimeLibrary="2"

diff --git a/win32/VS2005/libspeexdsp/libspeexdsp.vcproj b/win32/VS2005/libspeexdsp/libspeexdsp.vcproj
index 2d22d6a..407d036 100755
--- a/win32/VS2005/libspeexdsp/libspeexdsp.vcproj
+++ b/win32/VS2005/libspeexdsp/libspeexdsp.vcproj
@@ -696,7 +696,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

 				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

+				PreprocessorDefinitions="USE_SSE;WIN32;NDEBUG;_LIB;HAVE_CONFIG_H"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="0"

diff --git a/win32/VS2008/libspeexdsp/libspeexdsp.vcproj b/win32/VS2008/libspeexdsp/libspeexdsp.vcproj
index 3f7f325..3cc16e4 100755
--- a/win32/VS2008/libspeexdsp/libspeexdsp.vcproj
+++ b/win32/VS2008/libspeexdsp/libspeexdsp.vcproj
@@ -182,7 +182,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

 				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H"

+				PreprocessorDefinitions="USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="2"

@@ -269,7 +269,7 @@
 				EnableIntrinsicFunctions="true"

 				FavorSizeOrSpeed="1"

 				AdditionalIncludeDirectories="..\..\..\include;..\.."

-				PreprocessorDefinitions="_USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H"

+				PreprocessorDefinitions="USE_SSE;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_CONFIG_H"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="2"

diff --git a/win32/config.h b/win32/config.h
index 6366d7b..22745b1 100644
--- a/win32/config.h
+++ b/win32/config.h
@@ -3,19 +3,19 @@
 

 // In Visual Studio, _M_IX86_FP=1 means /arch:SSE was used, likewise

 // _M_IX86_FP=2 means /arch:SSE2 was used.

-// Also, enable both _USE_SSE and _USE_SSE2 if we're compiling for x86-64

+// Also, enable both USE_SSE and USE_SSE2 if we're compiling for x86-64

 #if _M_IX86_FP >= 1 || defined(_M_X64)

-#define _USE_SSE

+#define USE_SSE

 #endif

 

 #if _M_IX86_FP >= 2 || defined(_M_X64)

-#define _USE_SSE2

+#define USE_SSE2

 #endif

 

 // Visual Studio support alloca(), but it always align variables to 16-bit

 // boundary, while SSE need 128-bit alignment. So we disable alloca() when

 // SSE is enabled.

-#ifndef _USE_SSE

+#ifndef USE_SSE

 #  define USE_ALLOCA

 #endif