Merge branch 'master' into UsbTrackerOnWin

# Conflicts:
#	src/survive_vive.c

1 files changed, 7 insertions, 1 deletions

diff --git a/src/survive.c b/src/survive.c
index 81c45c3..f637bd8 100755
--- a/src/survive.c
+++ b/src/survive.c
@@ -9,6 +9,10 @@
 
 #include "survive_config.h"
 
+#ifdef __APPLE__
+#define z_const const
+#endif
+
 #ifdef RUNTIME_SYMNUM
 #include <symbol_enumerator.h>
 static int did_runtime_symnum;
@@ -161,6 +165,7 @@ int survive_add_object( SurviveContext * ctx, SurviveObject * obj )
 	ctx->objs = realloc( ctx->objs, sizeof( SurviveObject * ) * (oldct+1) );
 	ctx->objs[oldct] = obj;
 	ctx->objs_ct = oldct+1;
+	return 0;
 }
 
 void survive_add_driver( SurviveContext * ctx, void * payload, DeviceDriverCb poll, DeviceDriverCb close, DeviceDriverMagicCb magic )
@@ -184,7 +189,8 @@ int survive_send_magic( SurviveContext * ctx, int magic_code, void * data, int d
 	for( i = 0; i < oldct; i++ )
 	{
 		ctx->drivermagics[i]( ctx, ctx->drivers[i], magic_code, data, datalen );
-	}	
+	}
+	return 0;
 }
 
 void survive_close( SurviveContext * ctx )