X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fmain.c;h=83e60d8e0e252996094e9ccc61fb4f539abe954e;hb=45b4998e9369029d48c1f33fbccb1a525793cd46;hp=616aacd485a5801dc66b891bff78584413b6f134;hpb=2c3f0ebae9499a70314ba4520099d0006eb8e7fe;p=openocd.git

diff --git a/src/main.c b/src/main.c
index 616aacd485..83e60d8e0e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,34 +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. */
 
-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);
 }