X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Foptions.c;h=874196eabc5b82384a7c7c4caf7004617ca99cae;hp=a0c9a9e92859cef112913c985bbe1a7f4b7a856f;hb=ccf59123b72b01149063d5864ef61077786c033e;hpb=4b9bdd664a79d5713b22a178086b071abc049d01

diff --git a/src/helper/options.c b/src/helper/options.c
index a0c9a9e928..874196eabc 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -25,7 +25,6 @@
 #endif
 
 #include "configuration.h"
-#include "log.h"
 // @todo the inclusion of server.h here is a layering violation
 #include "server.h"
 
@@ -33,7 +32,7 @@
 
 static int help_flag, version_flag;
 
-static struct option long_options[] =
+static const struct option long_options[] =
 {
 	{"help",	no_argument,		&help_flag,	1},
 	{"version",	no_argument,		&version_flag,	1},
@@ -46,7 +45,7 @@ static struct option long_options[] =
 	{0, 0, 0, 0}
 };
 
-int configuration_output_handler(struct command_context_s *context, const char* line)
+int configuration_output_handler(struct command_context *context, const char* line)
 {
 	LOG_USER_N("%s", line);
 
@@ -108,7 +107,7 @@ static void add_default_dirs(void)
 #endif
 }
 
-int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[])
+int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[])
 {
 	int c;
 	char command_buffer[128];