From 9af56fd79d290318c2ff826f370eac16959e1350 Mon Sep 17 00:00:00 2001
From: Sergio Costa Fortier <sergiofortier@yahoo.com.br>
Date: Fri, 8 Aug 2014 14:04:59 -0300
Subject: [PATCH] Corrected ssize_t log printing. Cleanup.

---
 src/descrambler/capmt.c                 | 6 +++++-
 src/input/mpegts/satip/satip.c          | 6 +-----
 src/input/mpegts/satip/satip_frontend.c | 6 +-----
 src/timeshift/timeshift_reader.c        | 9 ++++++---
 src/upnp.c                              | 6 +-----
 5 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c
index e9a62ace..8d9d4b6d 100644
--- a/src/descrambler/capmt.c
+++ b/src/descrambler/capmt.c
@@ -627,7 +627,11 @@ capmt_write_msg(capmt_t *capmt, int adapter, int sid, const uint8_t *buf, size_t
 
   res = send(fd, buf, len, MSG_DONTWAIT);
   if (res < len) {
-    tvhlog(LOG_DEBUG, "capmt", "Message send failed to socket %i (%li)", fd, res);
+#if ENABLE_ANDROID
+    tvhlog(LOG_DEBUG, "capmt", "Message send failed to socket %i (%li)", fd, res); // Android bug, ssize_t is long int
+#else
+    tvhlog(LOG_DEBUG, "capmt", "Message send failed to socket %i (%zi)", fd, res);
+#endif
     if (capmt->capmt_oscam != CAPMT_OSCAM_SO_WRAPPER) {
       capmt_socket_close_lock(capmt, i);
       return -1;
diff --git a/src/input/mpegts/satip/satip.c b/src/input/mpegts/satip/satip.c
index 901a0092..0f65b599 100644
--- a/src/input/mpegts/satip/satip.c
+++ b/src/input/mpegts/satip/satip.c
@@ -29,15 +29,11 @@
 #include <arpa/inet.h>
 #include <openssl/sha.h>
 
-#if defined(PLATFORM_FREEBSD)
+#if defined(PLATFORM_FREEBSD) || ENABLE_ANDROID
 #include <sys/types.h>
 #include <sys/socket.h>
 #endif
 
-#if ENABLE_ANDROID
-#include <sys/socket.h>
-#endif
-
 static void satip_device_discovery_start( void );
 
 /*
diff --git a/src/input/mpegts/satip/satip_frontend.c b/src/input/mpegts/satip/satip_frontend.c
index a735e504..ea0459d6 100644
--- a/src/input/mpegts/satip/satip_frontend.c
+++ b/src/input/mpegts/satip/satip_frontend.c
@@ -24,15 +24,11 @@
 #include "http.h"
 #include "satip_private.h"
 
-#if defined(PLATFORM_FREEBSD)
+#if defined(PLATFORM_FREEBSD) || ENABLE_ANDROID
 #include <sys/types.h>
 #include <sys/socket.h>
 #endif
 
-#if ENABLE_ANDROID
-#include <sys/socket.h>
-#endif
-
 static int
 satip_frontend_tune1
   ( satip_frontend_t *lfe, mpegts_mux_instance_t *mmi );
diff --git a/src/timeshift/timeshift_reader.c b/src/timeshift/timeshift_reader.c
index fb94957d..44c6ac4e 100644
--- a/src/timeshift/timeshift_reader.c
+++ b/src/timeshift/timeshift_reader.c
@@ -336,9 +336,12 @@ static int _timeshift_read
       tvhlog(LOG_ERR, "timeshift", "ts %d could not read buffer", ts->id);
       return -1;
     }
-    tvhtrace("timeshift", "ts %d read msg %p (%ld)",
-             ts->id, *sm, r);
-
+#if ENABLE_ANDROID
+    tvhtrace("timeshift", "ts %d read msg %p (%ld)", ts->id, *sm, r);  // Android bug, ssize_t is long int
+#else
+    tvhtrace("timeshift", "ts %d read msg %p (%zd)", ts->id, *sm, r);
+#endif
+    
     /* Incomplete */
     if (r == 0) {
       lseek(*fd, *cur_off, SEEK_SET);
diff --git a/src/upnp.c b/src/upnp.c
index 25713d09..7d8c1ab8 100644
--- a/src/upnp.c
+++ b/src/upnp.c
@@ -34,15 +34,11 @@
 #include "tvhpoll.h"
 #include "upnp.h"
 
-#if defined(PLATFORM_FREEBSD)
+#if defined(PLATFORM_FREEBSD) || ENABLE_ANDROID
 #include <sys/types.h>
 #include <sys/socket.h>
 #endif
 
-#if ENABLE_ANDROID
-#include <sys/socket.h>
-#endif
-
 int              upnp_running;
 static pthread_t upnp_tid;
 pthread_mutex_t  upnp_lock;