some more work on VLC port - two files I missed initially.

This commit is contained in:
Cian Duffy
2012-12-11 22:33:05 +00:00
parent cd3b7342f7
commit 93781ba1c3

View File

@@ -496,3 +496,28 @@
SOURCES_libvlc_other = \ SOURCES_libvlc_other = \
posix/dirs.c \ posix/dirs.c \
misc/atomic.c \ misc/atomic.c \
--- vlc-2.0.3-orig/modules/gui/qt4/qt4.cpp 2012-07-02 00:47:23.031457280 +0000
+++ vlc-2.0.3/modules/gui/qt4/qt4.cpp 2012-12-11 21:52:28.551288832 +0000
@@ -628,7 +628,7 @@
if( !p_wnd->handle.hwnd )
return VLC_EGENERIC;
-#elif defined (Q_WS_MAC)
+#elif defined (Q_WS_MAC) || defined(Q_WS_HAIKU)
p_wnd->handle.nsobject = (void *)p_mi->getVideo( &i_x, &i_y, &i_width, &i_height );
if( !p_wnd->handle.nsobject )
return VLC_EGENERIC;
--- vlc-2.0.3-orig/src/network/io.c 2012-04-27 17:14:57.020709376 +0000
+++ vlc-2.0.3/src/network/io.c 2012-12-11 21:34:34.143392768 +0000
@@ -215,7 +215,9 @@
switch (ptr->ai_socktype)
{
case SOCK_STREAM:
+#ifdef SOCK_RDM
case SOCK_RDM:
+#endif
case SOCK_SEQPACKET:
#ifdef SOCK_DCCP
case SOCK_DCCP: