Merge branch 'master' into cairocanvas

[ardour.git] / libs / midi++2 / ipmidi_port.cc

diff --git a/libs/midi++2/ipmidi_port.cc b/libs/midi++2/ipmidi_port.cc
index 59606bffb20af40e4e36c9a453ef36b59dcf90b2..567df99335e4c41a7d4cc167e1c13d081189eca8 100644 (file)
--- a/libs/midi++2/ipmidi_port.cc
+++ b/libs/midi++2/ipmidi_port.cc
@@ -29,13 +29,13 @@
 #undef   O_NONBLOCK
 #define  O_NONBLOCK 0
 #endif
-#if defined(WIN32)
+#if defined(PLATFORM_WINDOWS)
 #include <winsock2.h>
 #else
 #include <netdb.h>
 #endif
 
-#if defined(WIN32)
+#if defined(PLATFORM_WINDOWS)
 static WSADATA g_wsaData;
 typedef int socklen_t;
 #else
@@ -44,9 +44,6 @@ typedef int socklen_t;
 inline void closesocket(int s) { ::close(s); }
 #endif
 
-#include <jack/jack.h>
-#include <jack/midiport.h>
-
 #include "pbd/xml++.h"
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
@@ -120,7 +117,7 @@ get_address (int sock, struct in_addr *inaddr, const string& ifname )
 {
        // Get interface address from supplied name.
 
-#if !defined(WIN32)
+#if !defined(PLATFORM_WINDOWS)
        struct ifreq ifr;
        ::strncpy(ifr.ifr_name, ifname.c_str(), sizeof(ifr.ifr_name));
 
@@ -149,13 +146,13 @@ get_address (int sock, struct in_addr *inaddr, const string& ifname )
 
        return false;
 
-#endif // !WIN32
+#endif // !PLATFORM_WINDOWS'
 }
 
 bool
 IPMIDIPort::open_sockets (int base_port, const string& ifname)
 {
-#if !defined(WIN32)
+#if !defined(PLATFORM_WINDOWS)
        int protonum = 0;
        struct protoent *proto = ::getprotobyname("IP");
 
@@ -254,7 +251,7 @@ IPMIDIPort::open_sockets (int base_port, const string& ifname)
        return true;
 #else
        return false;
-#endif // !WIN32
+#endif // !PLATFORM_WINDOWS'
 }
 
 int