Commit fe167061 authored by sletz's avatar sletz
Browse files

Compiles on Windows again

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2430 0c269be4-1314-0410-8aa9-9f06e86f4224
parent 215dfdd9
......@@ -36,8 +36,7 @@
namespace Jack
{
JackThreadedDriver::JackThreadedDriver(JackDriverClient* driver):
fThread(this)
JackThreadedDriver::JackThreadedDriver(JackDriverClient* driver):fThread(this)
{
fDriver = driver;
}
......
......@@ -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) {
......
......@@ -94,7 +94,7 @@ class JackWinAsyncNamedPipeClient : public JackWinNamedPipeClient
HANDLE GetEvent()
{
return fOverlap.hEvent;
return (HANDLE)fOverlap.hEvent;
}
kIOState GetIOState()
......
......@@ -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()
{
......
......@@ -34,7 +34,7 @@ typedef DWORD (WINAPI *ThreadCallback)(void *arg);
\brief Windows threads.
*/
class JackWinThread : public JackThread
class JackWinThread : public detail::JackThread
{
private:
......
......@@ -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
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment