From a152ce770dba4a97ac14623f5c4deb276df8e12f Mon Sep 17 00:00:00 2001
From: Joseph Henry <josephjah@gmail.com>
Date: Tue, 26 Jul 2016 13:56:10 -0700
Subject: [PATCH] zt_bind() ifdef fix

---
 src/SDK_Sockets.c | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/SDK_Sockets.c b/src/SDK_Sockets.c
index 430cdc1..70e335b 100644
--- a/src/SDK_Sockets.c
+++ b/src/SDK_Sockets.c
@@ -459,33 +459,31 @@ int (*realclose)(CLOSE_SIG);
         addr.sin_family = AF_INET;
         addr.sin_port = htons( port );
         (*env)->ReleaseStringUTFChars(env, addrstr, str);
-        return zt_bind(fd, (struct sockaddr *)&addr, sizeof(addr));
+        return zts_bind(fd, (struct sockaddr *)&addr, sizeof(addr));
     }
 #endif
 
-#if !defined(__ANDROID__)
-    #ifdef DYNAMIC_LIB
-        int zt_bind(BIND_SIG)
-    #else
-        int zts_bind(BIND_SIG)
-    #endif
-        {
-            get_api_netpath();
-            dwr(MSG_DEBUG,"zt_bind(%d)\n", sockfd);
-            struct bind_st rpc_st;
-            rpc_st.sockfd = sockfd;
-    #if defined(__linux__)
-        #if !defined(__ANDROID__)
-            rpc_st.__tid = 5;//syscall(SYS_gettid);
-        #else
-            rpc_st.__tid = gettid(); // dummy value
-        #endif
-    #endif
-            memcpy(&rpc_st.addr, addr, sizeof(struct sockaddr_storage));
-            memcpy(&rpc_st.addrlen, &addrlen, sizeof(socklen_t));
-            return rpc_send_command(api_netpath, RPC_BIND, sockfd, &rpc_st, sizeof(struct bind_st));
-        }
+#ifdef DYNAMIC_LIB
+    int zt_bind(BIND_SIG)
+#else
+    int zts_bind(BIND_SIG)
 #endif
+    {
+        get_api_netpath();
+        dwr(MSG_DEBUG,"zt_bind(%d)\n", sockfd);
+        struct bind_st rpc_st;
+        rpc_st.sockfd = sockfd;
+#if defined(__linux__)
+    #if !defined(__ANDROID__)
+        rpc_st.__tid = 5;//syscall(SYS_gettid);
+    #else
+        rpc_st.__tid = gettid(); // dummy value
+    #endif
+#endif
+        memcpy(&rpc_st.addr, addr, sizeof(struct sockaddr_storage));
+        memcpy(&rpc_st.addrlen, &addrlen, sizeof(socklen_t));
+        return rpc_send_command(api_netpath, RPC_BIND, sockfd, &rpc_st, sizeof(struct bind_st));
+    }
 
     // ------------------------------------------------------------------------------
     // ----------------------------------- accept4() --------------------------------