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

git-svn-id: svn://svn.berlios.de/openocd/trunk@1590 b42882b7-edfa-0310-969c-e2dbd0fdcd60

diff --git a/src/main.c b/src/main.c
index c2f30035f36916e5babf2002d72f2c9dff1556a8..c2b53da6e3dc7ae203e36a7d9f954b62e9468bf2 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -23,19 +23,6 @@
 #include "config.h"
 #endif
 
 #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
-

 /* This is the main entry for developer PC hosted OpenOCD.
  *
  * OpenOCD can also be used as a library that is linked with
 /* This is the main entry for developer PC hosted OpenOCD.
  *
  * OpenOCD can also be used as a library that is linked with

diff --git a/src/openocd.c b/src/openocd.c
index 00b33d4dec9b0d1dd37a92d722bd1d5b13a5fd8f..226a7310ad6fd1b3b6f266bd908c2b9861228845 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -228,6 +228,21 @@ static command_context_t *setup_command_handler(void)
 int httpd_start(void);
 void httpd_stop(void);
 
 int httpd_start(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
  * into application, then this fn will not be invoked, but rather that
  * application will have it's own implementation of main(). */
 /* normally this is the main() function entry, but if OpenOCD is linked
  * into application, then this fn will not be invoked, but rather that
  * application will have it's own implementation of main(). */