From 2d9edf9b1768b43e70717ecfe47fc021b877ee1b Mon Sep 17 00:00:00 2001 From: cnlohr Date: Sun, 14 May 2017 22:31:10 -0400 Subject: Fix warnings and compilation on Linux --- Makefile | 3 ++- calibrate.c | 3 ++- data_recorder.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 81654d9..2f4ab5c 100644 --- a/Makefile +++ b/Makefile @@ -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; -- cgit v1.2.3