Merge branch 'master' of https://github.com/cnlohr/libsurvive

2 files changed, 19 insertions, 2 deletions

diff --git a/include/libsurvive/survive.h b/include/libsurvive/survive.h
index 30f5817..d9b5f08 100644
--- a/include/libsurvive/survive.h
+++ b/include/libsurvive/survive.h
@@ -156,7 +156,15 @@ struct SurviveContext
 
 };
 
-SurviveContext * survive_init( int headless );
+SurviveContext * survive_init_internal( int headless );
+
+// Baked in size of FLT to verify users of the library have the correct setting. 
+void survive_verify_FLT_size(uint32_t user_size);
+  
+static inline SurviveContext * survive_init( int headless ) {
+  survive_verify_FLT_size(sizeof(FLT));
+  return survive_init_internal( headless );
+}
 
 //For any of these, you may pass in 0 for the function pointer to use default behavior.
 //In general unless you are doing wacky things like recording or playing back data, you won't need to use this.
diff --git a/src/survive.c b/src/survive.c
index 0386275..76bf8e4 100755
--- a/src/survive.c
+++ b/src/survive.c
@@ -94,7 +94,16 @@ static void *button_servicer(void * context)
 	return NULL;
 }
 
-SurviveContext * survive_init( int headless )
+void survive_verify_FLT_size(uint32_t user_size) {
+  if(sizeof(FLT) != user_size) {
+    fprintf(stderr, "FLT type incompatible; the shared library libsurvive has FLT size %lu vs user program %u\n", sizeof(FLT), user_size);
+    fprintf(stderr, "Add '#define FLT %s' before including survive.h or recompile the shared library with the appropriate flag. \n",
+	    sizeof(FLT) == sizeof(double) ? "double" : "float");
+    exit(-1);
+  }
+}
+
+SurviveContext * survive_init_internal( int headless )
 {
 #ifdef RUNTIME_SYMNUM
 	if( !did_runtime_symnum )