Android build, packet stream fixes

Signed-off-by: Andrew Opalach <andrew@akon.city>

5 files changed, 9 insertions, 8 deletions

diff --git a/src/util/packet.c b/src/util/packet.c
index 3b49ced..2658d38 100644
--- a/src/util/packet.c
+++ b/src/util/packet.c
@@ -30,7 +30,7 @@ void aki_packet_write_size(struct aki_packet *packet)
     *((u32 *)aki_buffer_get_ptr(&packet->buffer, 0)) = packet->windex;
 }
 
-u32 aki_packet_size(struct aki_packet *packet)
+u32 aki_packet_get_size(struct aki_packet *packet)
 {
     return *((u32 *)aki_buffer_get_ptr(&packet->buffer, 0));
 }
diff --git a/src/util/packet.h b/src/util/packet.h
index 83b75a3..72543a6 100644
--- a/src/util/packet.h
+++ b/src/util/packet.h
@@ -39,7 +39,7 @@ struct aki_packet *aki_packet_clone(struct aki_packet *packet);
 void aki_packet_reset(struct aki_packet *packet);
 
 void aki_packet_write_size(struct aki_packet *packet);
-u32 aki_packet_size(struct aki_packet *packet);
+u32 aki_packet_get_size(struct aki_packet *packet);
 
 void aki_packet_write_bool(struct aki_packet *packet, bool v);
 void aki_packet_write_s8(struct aki_packet *packet, s8 v);
diff --git a/src/util/thread/thread.h b/src/util/thread/thread.h
index 0c5042e..5975c84 100644
--- a/src/util/thread/thread.h
+++ b/src/util/thread/thread.h
@@ -8,16 +8,11 @@
 #include "../../winwrap.h"
 #endif
 
-#ifndef _WIN32
+#ifdef AKIYO_HAS_THREAD_CANCEL
 enum {
     AKI_THREAD_CANCEL_DEFERRED = PTHREAD_CANCEL_DEFERRED,
     AKI_THREAD_CANCEL_ASYNCHRONOUS = PTHREAD_CANCEL_ASYNCHRONOUS
 };
-#else
-enum {
-    AKI_THREAD_CANCEL_DEFERRED = 0,
-    AKI_THREAD_CANCEL_ASYNCHRONOUS
-};
 #endif
 
 struct aki_thread {
@@ -63,8 +58,10 @@ void aki_thread_sleep(aki_os_tstamp delay);
 
 void aki_thread_create(struct aki_thread *thread, aki_thread_func func, void *userdata);
 void aki_thread_join(struct aki_thread *thread);
+#ifdef AKIYO_HAS_THREAD_CANCEL
 void aki_thread_cancel(struct aki_thread *thread);
 void aki_thread_setcanceltype(s32 type);
+#endif
 //void aki_thread_detach(struct aki_thread *thread);
 
 void aki_mutex_init(struct aki_mutex *mutex);
diff --git a/src/util/thread/thread_linux.c b/src/util/thread/thread_linux.c
index 04b0868..26c3e18 100644
--- a/src/util/thread/thread_linux.c
+++ b/src/util/thread/thread_linux.c
@@ -22,6 +22,7 @@ void aki_thread_join(struct aki_thread *thread)
     pthread_join(thread->thread, NULL);
 }
 
+#ifdef AKIYO_HAS_THREAD_CANCEL
 void aki_thread_cancel(struct aki_thread *thread)
 {
     pthread_cancel(thread->thread);
@@ -31,6 +32,7 @@ void aki_thread_setcanceltype(s32 type)
 {
     pthread_setcanceltype(type, NULL);
 }
+#endif
 
 /*
 void aki_thread_detach(struct aki_thread *thread)
diff --git a/src/util/thread/thread_windows.c b/src/util/thread/thread_windows.c
index b7bc0ec..c7fdd62 100644
--- a/src/util/thread/thread_windows.c
+++ b/src/util/thread/thread_windows.c
@@ -18,6 +18,7 @@ void aki_thread_join(struct aki_thread *thread)
     CloseHandle(thread->thread);
 }
 
+#ifdef AKIYO_HAS_THREAD_CANCEL
 void aki_thread_cancel(struct aki_thread *thread)
 {
     (void)thread;
@@ -27,6 +28,7 @@ void aki_thread_setcanceltype(s32 type)
 {
     (void)type;
 }
+#endif
 
 /*
 void aki_thread_detach(struct aki_thread *thread)