X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=f3ff51b66b2a133c42b49273184faaf1068c3bad;hb=934ed07b0d05448a553d19daa14ad6196fc0c0fe;hp=c2f30035f36916e5babf2002d72f2c9dff1556a8;hpb=0fc19255c365a59acf4683d177bacf662e84d4f1;p=openocd.git

diff --git a/src/main.c b/src/main.c
index c2f30035f3..f3ff51b66b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -15,26 +15,13 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
-
-#if !BUILD_HTTPD
-/* implementations of OpenOCD that uses multithreading needs to know when
- * OpenOCD is sleeping. No-op in vanilla OpenOCD
- */
-void openocd_sleep_prelude(void)
-{
-}
-
-void openocd_sleep_postlude(void)
-{
-}
-#endif
+#include "openocd.h"
 
 /* This is the main entry for developer PC hosted OpenOCD.
  *
@@ -45,9 +32,11 @@ void openocd_sleep_postlude(void)
  * 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);
 }