[Openocd-svn] r1590 - trunk/src

[<oh...@ma...>]

Author: oharboe
Date: 2009-05-02 21:31:30 +0200 (Sat, 02 May 2009)
New Revision: 1590

Modified:
   trunk/src/main.c
   trunk/src/openocd.c
Log:
Dick Hollenbeck <di...@so...> moved stuff into openocd.c - should never have been in main.c in the first place. DLL will now build.

Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c	2009-05-02 12:26:10 UTC (rev 1589)
+++ trunk/src/main.c	2009-05-02 19:31:30 UTC (rev 1590)
@@ -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

Modified: trunk/src/openocd.c
===================================================================
--- trunk/src/openocd.c	2009-05-02 12:26:10 UTC (rev 1589)
+++ trunk/src/openocd.c	2009-05-02 19:31:30 UTC (rev 1590)
@@ -228,6 +228,21 @@
 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(). */