diff options
author | cnlohr <lohr85@gmail.com> | 2017-05-14 22:31:10 -0400 |
---|---|---|
committer | cnlohr <lohr85@gmail.com> | 2017-05-14 22:31:10 -0400 |
commit | 2d9edf9b1768b43e70717ecfe47fc021b877ee1b (patch) | |
tree | 5821a5e88ae65519fbe605eb71444cface0b2233 | |
parent | d7c6cb9860c3c8ed34b0d6db358c8c3b3edb2233 (diff) | |
download | libsurvive-2d9edf9b1768b43e70717ecfe47fc021b877ee1b.tar.gz libsurvive-2d9edf9b1768b43e70717ecfe47fc021b877ee1b.tar.bz2 |
Fix warnings and compilation on Linux
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | calibrate.c | 3 | ||||
-rw-r--r-- | data_recorder.c | 2 |
3 files changed, 5 insertions, 3 deletions
@@ -22,7 +22,8 @@ GRAPHICS_LOFI:=redist/CNFGFunctions.o redist/CocoaDriver.o # Linux / FreeBSD else -LDFLAGS:=$(LDFLAGS) -lX11 + +LDFLAGS:=$(LDFLAGS) -lX11 -lusb-1.0 DRAWFUNCTIONS=redist/CNFGFunctions.c redist/CNFGXDriver.c GRAPHICS_LOFI:=redist/CNFGFunctions.o redist/CNFGXDriver.o diff --git a/calibrate.c b/calibrate.c index 9a43696..cc62914 100644 --- a/calibrate.c +++ b/calibrate.c @@ -188,7 +188,7 @@ void * SurviveThread(void *jnk) if( !ctx ) { fprintf( stderr, "Fatal. Could not start\n" ); - return 1; + exit( 1 ); } SurviveThreadLoaded=1; @@ -199,6 +199,7 @@ void * SurviveThread(void *jnk) } survive_close( ctx ); + return 0; } diff --git a/data_recorder.c b/data_recorder.c index 085b67d..002357e 100644 --- a/data_recorder.c +++ b/data_recorder.c @@ -149,7 +149,7 @@ void *SurviveThread(void *junk) if( !ctx ) { fprintf( stderr, "Fatal. Could not start\n" ); - return 1; + exit(1); } SurviveThreadLoaded = 1; |