projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "target: remove unused working area 'user' field"
[fw/openocd]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index c2f30035f36916e5babf2002d72f2c9dff1556a8..2585c663cb0d16d226921d950547a231d3b03ced 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-18,23
+18,10
@@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#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.
*
/* 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. */
* 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[])
{
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);
}
return openocd_main(argc, argv);
}