From: oharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>
Date: Sat, 2 May 2009 19:31:30 +0000 (+0000)
Subject: Dick Hollenbeck <dick@softplc.com> moved stuff into openocd.c - should never have... 
X-Git-Tag: v0.2.0~915
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6cacbd9575e03c37057719a97bf260217c4e275f;p=openocd

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
---

diff --git a/src/main.c b/src/main.c
index c2f30035..c2b53da6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,19 +23,6 @@
 #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
diff --git a/src/openocd.c b/src/openocd.c
index 00b33d4d..226a7310 100644
--- 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);
 
+
+#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(). */