From fe16706170ddc1b3987731d4da4b3530ea5dd8c1 Mon Sep 17 00:00:00 2001
From: sletz <sletz@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Tue, 3 Jun 2008 09:43:37 +0000
Subject: [PATCH] Compiles on Windows again

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2430 0c269be4-1314-0410-8aa9-9f06e86f4224
---
 common/JackThreadedDriver.cpp | 3 +--
 common/Jackdmp.cpp            | 3 ++-
 windows/JackWinNamedPipe.h    | 2 +-
 windows/JackWinProcessSync.h  | 3 +--
 windows/JackWinThread.h       | 2 +-
 windows/libjackmp.dsp         | 6 +-----
 windows/libjackservermp.dsp   | 4 ----
 7 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/common/JackThreadedDriver.cpp b/common/JackThreadedDriver.cpp
index a2f14437..96f9393a 100644
--- a/common/JackThreadedDriver.cpp
+++ b/common/JackThreadedDriver.cpp
@@ -36,8 +36,7 @@
 namespace Jack
 {
 
-JackThreadedDriver::JackThreadedDriver(JackDriverClient* driver):
-    fThread(this)
+JackThreadedDriver::JackThreadedDriver(JackDriverClient* driver):fThread(this)
 {
     fDriver = driver;
 }
diff --git a/common/Jackdmp.cpp b/common/Jackdmp.cpp
index 1732ac0e..4b952f7a 100644
--- a/common/Jackdmp.cpp
+++ b/common/Jackdmp.cpp
@@ -92,7 +92,6 @@ static void copyright(FILE* file)
 
 static void usage(FILE* file)
 {
-    copyright(file);
     fprintf(file, "\n"
             "usage: jackdmp [ --realtime OR -R [ --realtime-priority OR -P priority ] ]\n"
             "               [ --name OR -n server-name ]\n"
@@ -187,6 +186,8 @@ int main(int argc, char* argv[])
     sigset_t signals;
     jackctl_parameter_t* param;
     union jackctl_parameter_value value;
+
+	copyright(stdout);
     
     server_ctl = jackctl_server_create();
     if (server_ctl == NULL) {
diff --git a/windows/JackWinNamedPipe.h b/windows/JackWinNamedPipe.h
index 20d7eebc..b839d419 100644
--- a/windows/JackWinNamedPipe.h
+++ b/windows/JackWinNamedPipe.h
@@ -94,7 +94,7 @@ class JackWinAsyncNamedPipeClient : public JackWinNamedPipeClient
 
         HANDLE GetEvent()
         {
-            return fOverlap.hEvent;
+            return (HANDLE)fOverlap.hEvent;
         }
 
         kIOState GetIOState()
diff --git a/windows/JackWinProcessSync.h b/windows/JackWinProcessSync.h
index 4a3fa467..1c1f8071 100644
--- a/windows/JackWinProcessSync.h
+++ b/windows/JackWinProcessSync.h
@@ -21,7 +21,6 @@ This program is free software; you can redistribute it and/or modify
 #define __JackWinProcessSync__
 
 #include <windows.h>
-#include <new>
 
 namespace Jack
 {
@@ -41,7 +40,7 @@ class JackWinProcessSync
 
         JackWinProcessSync()
         {
-            fEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+            fEvent = (HANDLE)CreateEvent(NULL, FALSE, FALSE, NULL);
         }
         ~JackWinProcessSync()
         {
diff --git a/windows/JackWinThread.h b/windows/JackWinThread.h
index 6fb59943..ccb69734 100644
--- a/windows/JackWinThread.h
+++ b/windows/JackWinThread.h
@@ -34,7 +34,7 @@ typedef DWORD  (WINAPI *ThreadCallback)(void *arg);
 \brief Windows threads.
 */
 
-class JackWinThread : public JackThread
+class JackWinThread : public detail::JackThread
 {
 
     private:
diff --git a/windows/libjackmp.dsp b/windows/libjackmp.dsp
index 59fb2baa..cde760ec 100644
--- a/windows/libjackmp.dsp
+++ b/windows/libjackmp.dsp
@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBJACKMP_EXPORTS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBJACKMP_EXPORTS" /D "__STDC__" /D "REGEX_MALLOC" /D "STDC_HEADERS" /D "__SMP__" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "." /I "../common" /I "../common/jack" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBJACKMP_EXPORTS" /D "__STDC__" /D "REGEX_MALLOC" /D "STDC_HEADERS" /D "__SMP__" /FR /YX /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x40c /d "NDEBUG"
@@ -127,10 +127,6 @@ SOURCE=..\common\JackGlobals.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\common\JackGlobalsClient.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\common\JackGraphManager.cpp
 # End Source File
 # Begin Source File
diff --git a/windows/libjackservermp.dsp b/windows/libjackservermp.dsp
index 90866ba8..186c6219 100644
--- a/windows/libjackservermp.dsp
+++ b/windows/libjackservermp.dsp
@@ -164,10 +164,6 @@ SOURCE=..\common\JackGlobals.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\common\JackGlobalsServer.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\common\JackGraphManager.cpp
 # End Source File
 # Begin Source File