diff options
| author | Zachary T Welch <zw@superlucidity.net> | 2009-12-01 19:58:32 -0800 |
|---|---|---|
| committer | Zachary T Welch <zw@superlucidity.net> | 2009-12-02 13:26:26 -0800 |
| commit | 6ec526e706483cd2de6c8de4bafa885522a782cd (patch) | |
| tree | 6cb875f779151bcfb738bf90df74814c8d6ea86b /src/openocd.c | |
| parent | eaf10f69de969652d03742809b9c970158b90719 (diff) | |
| download | openocd+libswd-6ec526e706483cd2de6c8de4bafa885522a782cd.tar.gz openocd+libswd-6ec526e706483cd2de6c8de4bafa885522a782cd.tar.bz2 openocd+libswd-6ec526e706483cd2de6c8de4bafa885522a782cd.tar.xz openocd+libswd-6ec526e706483cd2de6c8de4bafa885522a782cd.zip | |
remove #if BUILD_HTTPD
Add httpd_stubs.c to provide no-op implementations of httpd_start()
and httpd_stop().
Allows these routines to be called unconditionally and ensures the
libocdserver ABI remains unchanged regardless of whether this feature
was built-in or not.
Prints a DEBUG message when the stub implementation is included.
Diffstat (limited to 'src/openocd.c')
| -rw-r--r-- | src/openocd.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/openocd.c b/src/openocd.c index 1f458372..9a080191 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -244,10 +244,8 @@ int openocd_main(int argc, char *argv[]) if (ret != ERROR_OK) return EXIT_FAILURE; -#if BUILD_HTTPD if (httpd_start(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; -#endif ret = server_init(cmd_ctx); if (ERROR_OK != ret) @@ -266,9 +264,7 @@ int openocd_main(int argc, char *argv[]) server_quit(); -#if BUILD_HTTPD httpd_stop(); -#endif unregister_all_commands(cmd_ctx, NULL); |