Browse Source

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
tags/v0.2.0
oharboe 15 years ago
parent
commit
6cacbd9575
2 changed files with 15 additions and 13 deletions
  1. +0
    -13
      src/main.c
  2. +15
    -0
      src/openocd.c

+ 0
- 13
src/main.c View File

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


+ 15
- 0
src/openocd.c View File

@@ -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(). */


Loading…
Cancel
Save