Compiles again on Windows.

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4678 0c269be4-1314-0410-8aa9-9f06e86f4224

common/JackDriverLoader.cpp

@@ -70,7 +70,7 @@ static char* locate_system_driver_dir()
     }
 }
 
-static char* locate_driver_dir(HANDLE file&, WIN32_FIND_DATA& filedata)
+static char* locate_driver_dir(HANDLE& file, WIN32_FIND_DATA& filedata)
 {
     char dll_filename[512];
 
@@ -450,7 +450,7 @@ static void* check_symbol(const char* sofile, const char* symbol, const char* dr
         jack_error ("Could not open component .so '%s': %s", filename, dlerror());
 #endif
     } else {
-        res = GetDriverProc(dlhandle, symbol);
+        res = (void*)GetDriverProc(dlhandle, symbol);
         if (res_dllhandle) {
             *res_dllhandle = dlhandle;
         } else {

common/JackNetOneDriver.cpp

@@ -56,7 +56,7 @@ JackNetOneDriver::JackNetOneDriver(const char* name, const char* alias, JackLock
 
 #ifdef WIN32
     WSADATA wsa;
-    int rc = WSAStartup(MAKEWORD(2, 0), &wsa);
+    WSAStartup(MAKEWORD(2, 0), &wsa);
 #endif
 
     netjack_init(& (this->netj),

common/jack/control.h

@@ -28,7 +28,8 @@
 
 #ifndef JACKCTL_H__2EEDAD78_DF4C_4B26_83B7_4FF1A446A47E__INCLUDED
 #define JACKCTL_H__2EEDAD78_DF4C_4B26_83B7_4FF1A446A47E__INCLUDED
-
+
+#include <types.h>
 #include <jack/jslist.h>
 #include <jack/systemdeps.h>
 #if !defined(sun) && !defined(__sun__)

common/netjack_packet.c

@@ -505,11 +505,11 @@ packet_cache_drain_socket( packet_cache *pcache, int sockfd )
     cache_packet *cpack;
     struct sockaddr_in sender_address;
 #ifdef WIN32
-    size_t senderlen = sizeof( struct sockaddr_in );
+    int senderlen = sizeof( struct sockaddr_in );
     u_long parm = 1;
     ioctlsocket( sockfd, FIONBIO, &parm );
 #else
-    socklen_t senderlen = sizeof( struct sockaddr_in );
+    int senderlen = sizeof( struct sockaddr_in );
 #endif
     while (1) {
 #ifdef WIN32

example-clients/midi_latency_test.c

@@ -214,7 +214,7 @@ get_semaphore_error(void)
     if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error,
                         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
                         semaphore_error_msg, 1024, NULL)) {
-        snprintf(semaphore_error_msg, 1023, "Unknown OS error code '%d'",
+        snprintf(semaphore_error_msg, 1023, "Unknown OS error code '%ld'",
                 error);
     }
     return semaphore_error_msg;

windows/jackd.cbp

@@ -21,6 +21,7 @@
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
 					<Add option="-D_MBCS" />
+					<Add option="-D_POSIX" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -44,6 +45,7 @@
 					<Add option="-D_DEBUG" />
 					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
+					<Add option="-D_POSIX" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -69,6 +71,7 @@
 					<Add option="-D_WINDOWS" />
 					<Add option="-D_MBCS" />
 					<Add option="-DJACK_MONITOR" />
+					<Add option="-D_POSIX" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -95,6 +98,7 @@
 					<Add option="-DNDEBUG" />
 					<Add option="-D_WINDOWS" />
 					<Add option="-D_MBCS" />
+					<Add option="-D_POSIX" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -123,6 +127,7 @@
 					<Add option="-D_DEBUG" />
 					<Add option="-D_CONSOLE" />
 					<Add option="-D_MBCS" />
+					<Add option="-D_POSIX" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />
@@ -153,6 +158,7 @@
 					<Add option="-D_WINDOWS" />
 					<Add option="-D_MBCS" />
 					<Add option="-DJACK_MONITOR" />
+					<Add option="-D_POSIX" />
 					<Add directory="." />
 					<Add directory="..\windows" />
 					<Add directory="..\common\jack" />

windows/winmme/JackWinMMEDriver.cpp

@@ -363,8 +363,6 @@ extern "C"
 
     SERVER_EXPORT jack_driver_desc_t * driver_get_descriptor()
     {
-        jack_driver_desc_t * desc;
-
         return jack_driver_descriptor_construct("winmme", JackDriverSlave, "WinMME API based MIDI backend", NULL);
     }
 

windows/winmme/JackWinMMEInputPort.cpp

@@ -191,7 +191,9 @@ JackWinMMEInputPort::ProcessJack(JackMidiBuffer *port_buffer,
                        "event.", jack_event->size);
             // Fallthrough on purpose
         case JackMidiWriteQueue::OK:
-            continue;
+            continue;
+        default:
+            break;
         }
         break;
     }

windows/winmme/JackWinMMEPort.cpp

@@ -55,7 +55,7 @@ JackWinMMEPort::GetOSErrorString(LPTSTR text)
     if (! FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, error,
                         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), text,
                         MAXERRORLENGTH, NULL)) {
-        snprintf(text, MAXERRORLENGTH, "Unknown OS error code '%d'", error);
+        snprintf(text, MAXERRORLENGTH, "Unknown OS error code '%ld'", error);
     }
 }