X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fmain.c;h=83e60d8e0e252996094e9ccc61fb4f539abe954e;hp=ce6e919f9a84f7e83ada0c7aa7a8176ef408c1f8;hb=d46b28983dc27369e90f4dc8a0e54b5057583b38;hpb=b31d83c6c7eb274144acc7c40ea4bf8424b6b1e0

diff --git a/src/main.c b/src/main.c
index ce6e919f9a..83e60d8e0e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,40 +13,28 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   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.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-/* implementations of OpenOCD that uses multithreading needs to know when
- * OpenOCD is sleeping. No-op in vanilla OpenOCD
- */
-void openocd_sleep_prelude()
-{
-}
-
-void openocd_sleep_postlude()
-{
-}
+#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);
 }
-
-