From: Michael Farrell <micolous+gh@gmail.com>
Date: Thu, 28 Dec 2017 17:27:39 +0000 (+1000)
Subject: Allow externalisation of PrintAndLog (#506)
X-Git-Tag: v3.1.0~96
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/3775e9e8651ee9d11c11efca550442128f468ee5?ds=inline;hp=--cc

Allow externalisation of PrintAndLog (#506)
---

3775e9e8651ee9d11c11efca550442128f468ee5
diff --git a/client/ui.c b/client/ui.c
index df2c3ce3..8faed6e8 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -9,12 +9,14 @@
 // UI utilities
 //-----------------------------------------------------------------------------
 
-#include <stdarg.h>
+#include <stdbool.h>
+#ifndef EXTERNAL_PRINTANDLOG
 #include <stdlib.h>
 #include <stdio.h>
-#include <stdbool.h>
+#include <stdarg.h>
 #include <readline/readline.h>
 #include <pthread.h>
+#endif
 
 #include "ui.h"
 
@@ -26,10 +28,12 @@ int GridOffset = 0;
 bool GridLocked = false;
 bool showDemod = true;
 
-extern pthread_mutex_t print_lock;
-
 static char *logfilename = "proxmark3.log";
 
+#ifndef EXTERNAL_PRINTANDLOG
+// Declared in proxmark3.c
+extern pthread_mutex_t print_lock;
+
 void PrintAndLog(char *fmt, ...)
 {
 	char *saved_line;
@@ -94,7 +98,7 @@ void PrintAndLog(char *fmt, ...)
 	//release lock
 	pthread_mutex_unlock(&print_lock);  
 }
-
+#endif
 
 void SetLogFilename(char *fn)
 {