sclang: win32/msvc compile fixes

Signed-off-by: Tim Blechmann <tim@klingt.org>
supercollider · Feb 8, 2013 · 9e7d651 · 9e7d651
1 parent ab7662a
commit 9e7d651
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 22 deletions.
diff --git a/include/lang/SC_TerminalClient.h b/include/lang/SC_TerminalClient.h
@@ -163,7 +163,7 @@ class SC_DLLEXPORT SC_TerminalClient : public SC_LanguageClient
 #ifndef _WIN32
 	int mInputCtlPipe[2];
 #else
-	HANDLE mQuitInputEvent;
+	void * mQuitInputEvent;
 #endif
 	pthread_t mInputThread;
 	pthread_mutex_t mInputMutex;

diff --git a/lang/LangPrimSource/PyrFilePrim.cpp b/lang/LangPrimSource/PyrFilePrim.cpp
@@ -1326,12 +1326,7 @@ int prPipeClose(struct VMGlobals *g, int numArgsPushed)
 ////////
 
 #ifndef NO_LIBSNDFILE
-
-#ifdef SC_WIN32
-	#include <sndfile-win.h>
-#else
-	#include <sndfile.h>
-#endif
+#include <sndfile.h>
 
 
 int sampleFormatToString(struct SF_INFO *info, const char **string);

diff --git a/lang/LangPrimSource/PyrPlatformPrim.cpp b/lang/LangPrimSource/PyrPlatformPrim.cpp
@@ -28,6 +28,7 @@ Primitives for platform dependent directories, constants etc.
 #include "PyrKernel.h"
 #ifdef _WIN32
 # include "SC_Win32Utils.h"
+# include "Shlobj.h"
 #endif
 
 #define PATH_CONSTANT_PRIM_BODY(func) \

diff --git a/lang/LangSource/PyrMathSupport.cpp b/lang/LangSource/PyrMathSupport.cpp
@@ -50,21 +50,6 @@ void pyrmath_init_globs()
 
 // 1/440 = 0.0022727272727     1/12 = 0.083333333333
 
-// These are built in on OSX and Linux
-#if !(SC_DARWIN || __linux__)
-double log2(double x);
-double log2(double x)
-{
-	return log(x) * rlog2;
-}
-
-double hypot(double x, double y);
-double hypot(double x, double y)
-{
-	return sqrt(x*x + y*y);
-}
-#endif // !SC_DARWIN && !__linux__
-
 #define SQRT2M1 0.41421356f
 
 double hypotx(double x, double y);