allow generic i386 builds with OSX/clang

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

diff --git a/libs/midi++2/midi++/ipmidi_port.h b/libs/midi++2/midi++/ipmidi_port.h
index 32cf1163e6ffdddb82a43428e2da8f707e1a5e72..a0566125143319a9176bb4b737a9b7ed80767fa0 100644 (file)
--- a/libs/midi++2/midi++/ipmidi_port.h
+++ b/libs/midi++2/midi++/ipmidi_port.h
@@ -21,29 +21,39 @@
 
 #include <string>
 #include <iostream>
-#if defined(WIN32)
+#if defined(PLATFORM_WINDOWS)
 #include <winsock.h>
+#elif defined(__FREE_BSD__)
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <sys/_sockaddr_storage.h>
+#include <arpa/inet.h>
+#include <netinet/ip_carp.h>
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/route.h>
 #else
 #include <arpa/inet.h>
 #include <net/if.h>
 #endif
 
-#include <glibmm/thread.h>
-
-#include <jack/types.h>
+#include <glibmm/threads.h>
 
 #include "pbd/xml++.h"
 #include "pbd/crossthread.h"
 #include "pbd/signals.h"
 #include "pbd/ringbuffer.h"
 
+#include "midi++/libmidi_visibility.h"
 #include "midi++/types.h"
 #include "midi++/parser.h"
 #include "midi++/port.h"
 
 namespace MIDI {
 
-class IPMIDIPort : public Port {
+class LIBMIDIPP_API IPMIDIPort : public Port {
   public:
     IPMIDIPort (int base_port = lowest_ipmidi_port_default, const std::string& ifname = std::string());
     IPMIDIPort (const XMLNode&);
@@ -63,7 +73,7 @@ private:
     int sockin;
     int sockout;
     struct sockaddr_in addrout;
-    Glib::Mutex write_lock;    
+    Glib::Threads::Mutex write_lock;    
 
     bool open_sockets (int base_port, const std::string& ifname);
     void close_sockets ();