X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Futilities.h;h=f55997a5852eb754605693100ae2482aa4cc422c;hb=98c99981e0ebe7f716bea2e4d95434d159103fcd;hp=6f8967af442b445f10734744a1978106279342e4;hpb=2f44187ce709c4524aef74f9d2e788d5845829d5;p=m6w6%2Flibmemcached

diff --git a/clients/utilities.h b/clients/utilities.h
index 6f8967af..f55997a5 100644
--- a/clients/utilities.h
+++ b/clients/utilities.h
@@ -1,7 +1,17 @@
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary:
+ *
+ */
+
 #include <getopt.h>
-#include <assert.h>
+#include <libmemcached/memcached.h>
 #include "client_options.h"
-#include "libmemcached_config.h"
 
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
@@ -14,6 +24,15 @@
 # endif
 #endif
 
+#ifdef __sun
+  /* For some odd reason the option struct on solaris defines the argument
+   * as char* and not const char*
+   */
+#define OPTIONSTRING char*
+#else
+#define OPTIONSTRING const char*
+#endif
+
 typedef struct memcached_programs_help_st memcached_programs_help_st;
 
 struct memcached_programs_help_st 
@@ -24,8 +43,8 @@ struct memcached_programs_help_st
 char *strdup_cleanup(const char *str);
 void cleanup(void);
 long int timedif(struct timeval a, struct timeval b);
-void version_command(char *command_name);
-void help_command(char *command_name, char *description,
+void version_command(const char *command_name);
+void help_command(const char *command_name, const char *description,
                   const struct option *long_options,
                   memcached_programs_help_st *options);
 void process_hash_option(memcached_st *memc, char *opt_hash);