Misc win32 portability fixes

Based on a patch by Conrad Poelman

9 files changed, 18 insertions, 16 deletions

diff --git a/configure.ac b/configure.ac
index 514e11ef..aba08cd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,9 +247,10 @@ AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_32, [Ignore post 2.32 deprec
 AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_32, [Prevent post 2.32 APIs])
 
 
-PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= 2.32)
+PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= 2.32, [HAVE_GIO_UNIX=true],[HAVE_GIO_UNIX=false])
 AC_SUBST(GIO_UNIX_CFLAGS)
 AC_SUBST(GIO_UNIX_LIBS)
+AM_CONDITIONAL(HAVE_GIO_UNIX, test "x$HAVE_GIO_UNIX" = "xyes")
 
 dnl checks for gstreamer
 dnl uninstalled is selected preferentially -- see pkg-config(1)
diff --git a/examples/commandline/Makefile.am b/examples/commandline/Makefile.am
index 81f4ed4a..6eedd524 100644
--- a/examples/commandline/Makefile.am
+++ b/examples/commandline/Makefile.am
@@ -1,5 +1,11 @@
 
-noinst_PROGRAMS = simple-call simple-call-shm
+if HAVE_GIO_UNIX
+SIMPLE_CALL_SHM = simple-call-shm
+else
+SIMPLE_CALL_SHM =
+endif
+
+noinst_PROGRAMS = simple-call $(SIMPLE_CALL_SHM)
 
 
 AM_CFLAGS = \
diff --git a/farstream/Makefile.am b/farstream/Makefile.am
index fe4c90ba..6e5cf9af 100644
--- a/farstream/Makefile.am
+++ b/farstream/Makefile.am
@@ -47,7 +47,7 @@ nodist_libfarstream_@FS_APIVERSION@_la_SOURCES = \
 
 libfarstream_@FS_APIVERSION@_la_CFLAGS = \
 	$(FS_INTERNAL_CFLAGS) $(FS_CFLAGS) \
-	$(GLIB_FLAGS) \
+	$(GLIB_CFLAGS) \
 	$(GST_PLUGINS_BASE_CFLAGS) \
 	$(GST_BASE_CFLAGS) \
 	$(GST_CFLAGS)
diff --git a/gst/fsrawconference/fs-raw-stream.c b/gst/fsrawconference/fs-raw-stream.c
index e361bc7f..fe5326b2 100644
--- a/gst/fsrawconference/fs-raw-stream.c
+++ b/gst/fsrawconference/fs-raw-stream.c
@@ -48,10 +48,6 @@
 #include "fs-raw-stream.h"
 #include "fs-raw-session.h"
 
-#include <arpa/inet.h>
-#include <fcntl.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/gst/fsrtpconference/fs-rtp-tfrc.c b/gst/fsrtpconference/fs-rtp-tfrc.c
index 8c6c2f18..7cda169b 100644
--- a/gst/fsrtpconference/fs-rtp-tfrc.c
+++ b/gst/fsrtpconference/fs-rtp-tfrc.c
@@ -914,9 +914,9 @@ incoming_rtcp_probe (GstPad *pad, GstPadProbeInfo *info, gpointer user_data)
       x_recv = GST_READ_UINT32_BE (buf);
       buf += 4;
       loss_event_rate = (gdouble) GST_READ_UINT32_BE (buf) / (gdouble) G_MAXUINT;
-      GST_LOG_OBJECT (self, "Got RTCP TFRC packet last_sent_ts: %u"
-          " delay: %u x_recv: %u loss_event_rate: %f", ts, delay, x_recv,
-          loss_event_rate);
+      GST_LOG_OBJECT (self, "Got RTCP TFRC packet last_sent_ts: %"
+          G_GUINT64_FORMAT " delay: %u x_recv: %u loss_event_rate: %f", ts,
+          delay, x_recv, loss_event_rate);
 
       GST_OBJECT_LOCK (self);
 
@@ -968,7 +968,8 @@ incoming_rtcp_probe (GstPad *pad, GstPadProbeInfo *info, gpointer user_data)
 
       if (rtt > 10 * 1000 * 1000)
       {
-        GST_WARNING_OBJECT (self, "Impossible RTT %u ms, ignoring", rtt);
+        GST_WARNING_OBJECT (self, "Impossible RTT %" G_GUINT64_FORMAT
+            " ms, ignoring", rtt);
         goto done;
       }
 
diff --git a/tests/rtp/Makefile.am b/tests/rtp/Makefile.am
index cb603b96..1740faf6 100644
--- a/tests/rtp/Makefile.am
+++ b/tests/rtp/Makefile.am
@@ -12,8 +12,8 @@ codec_discovery_CFLAGS = \
 	$(CFLAGS)
 
 LDADD = \
-	$(top_builddir)/farstream/libfarstream-@FS_APIVERSION@.la \
 	$(top_builddir)/gst/fsrtpconference/libfsrtpconference-convenience.la \
+	$(top_builddir)/farstream/libfarstream-@FS_APIVERSION@.la \
 	$(GST_CHECK_LIBS) \
 	$(GST_PLUGINS_BASE_LIBS) \
 	$(GST_LIBS) \
diff --git a/transmitters/nice/fs-nice-transmitter.c b/transmitters/nice/fs-nice-transmitter.c
index 4cca547b..7674c868 100644
--- a/transmitters/nice/fs-nice-transmitter.c
+++ b/transmitters/nice/fs-nice-transmitter.c
@@ -42,8 +42,6 @@
 #include <farstream/fs-conference.h>
 #include <farstream/fs-plugin.h>
 
-#include <agent.h>
-
 #include <string.h>
 #include <sys/types.h>
 
diff --git a/transmitters/nice/fs-nice-transmitter.h b/transmitters/nice/fs-nice-transmitter.h
index a203ce36..c39e77e4 100644
--- a/transmitters/nice/fs-nice-transmitter.h
+++ b/transmitters/nice/fs-nice-transmitter.h
@@ -28,7 +28,7 @@
 #include <farstream/fs-transmitter.h>
 
 #include <gst/gst.h>
-#include <agent.h>
+#include <nice/agent.h>
 
 G_BEGIN_DECLS
 
diff --git a/transmitters/shm/fs-shm-stream-transmitter.c b/transmitters/shm/fs-shm-stream-transmitter.c
index fd2192ee..5e8884f4 100644
--- a/transmitters/shm/fs-shm-stream-transmitter.c
+++ b/transmitters/shm/fs-shm-stream-transmitter.c
@@ -562,7 +562,7 @@ fs_shm_stream_transmitter_gather_local_candidates (
     socket_dir = g_build_filename (g_get_tmp_dir (),
       "farstream-shm-XXXXXX", NULL);
 
-    if (mkdtemp (socket_dir) == NULL)
+    if (g_mkdtemp (socket_dir) == NULL)
       return FALSE;
 
     self->priv->socket_dir = socket_dir;