Commit 6cacbd95 authored by oharboe's avatar oharboe
Browse files

Dick Hollenbeck <dick@softplc.com> moved stuff into openocd.c - should never...

Dick Hollenbeck <dick@softplc.com> moved stuff into openocd.c - should never have been in main.c in the first place. DLL will now build.

git-svn-id: svn://svn.berlios.de/openocd/trunk@1590 b42882b7-edfa-0310-969c-e2dbd0fdcd60
parent e69b222d
...@@ -23,19 +23,6 @@ ...@@ -23,19 +23,6 @@
#include "config.h" #include "config.h"
#endif #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
/* This is the main entry for developer PC hosted OpenOCD. /* This is the main entry for developer PC hosted OpenOCD.
* *
* OpenOCD can also be used as a library that is linked with * OpenOCD can also be used as a library that is linked with
......
...@@ -228,6 +228,21 @@ static command_context_t *setup_command_handler(void) ...@@ -228,6 +228,21 @@ static command_context_t *setup_command_handler(void)
int httpd_start(void); int httpd_start(void);
void httpd_stop(void); void httpd_stop(void);
#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
/* normally this is the main() function entry, but if OpenOCD is linked /* normally this is the main() function entry, but if OpenOCD is linked
* into application, then this fn will not be invoked, but rather that * into application, then this fn will not be invoked, but rather that
* application will have it's own implementation of main(). */ * application will have it's own implementation of main(). */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment