X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fmain.c;h=2585c663cb0d16d226921d950547a231d3b03ced;hp=cc592238d6054c6a58778b9478f50012dbdbe781;hb=ceb402dc9e903d2f3f6bc8125dfed9d82b83d2d1;hpb=655e4f88a6b7fd82a570a17cf1219356f4587a37

diff --git a/src/main.c b/src/main.c
index cc592238d6..2585c663cb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -18,32 +18,25 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-/* implementations of OpenOCD that uses multithreading needs to lock OpenOCD while calling
- * OpenOCD fn's. No-op in vanilla OpenOCD
- */
-void lockBigLock()
-{
-}
-void unlockBigLock()
-{
-}
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+#include "openocd.h"
 
-/* 
-	This is the main entry for developer PC hosted OpenOCD.
-	
-	OpenOCD can also be used as a library that is linked with
-	another application(not mainstream yet, but possible), e.g.
-	w/as an embedded application.
-	
-	Those applications will have their own main() implementation
-	and use bits and pieces from openocd.c.
-	
-*/
+/* This is the main entry for developer PC hosted OpenOCD.
+ *
+ * OpenOCD can also be used as a library that is linked with
+ * another application(not mainstream yet, but possible), e.g.
+ * w/as an embedded application.
+ *
+ * Those applications will have their own main() implementation
+ * and use bits and pieces from openocd.c. */
 
-
-extern int openocd_main(int argc, char *argv[]);
 int main(int argc, char *argv[])
 {
+	/* disable buffering otherwise piping to logs causes problems work */
+	setvbuf(stdout, NULL, _IONBF, 0);
+	setvbuf(stderr, NULL, _IONBF, 0);
+
 	return openocd_main(argc, argv);
 }
-