Fix compile errors with gcc

[awesomized/libmemcached] / clients / utilities.h

diff --git a/clients/utilities.h b/clients/utilities.h
index 6d4d72d444419d38073ac6233bd6ce198ebec19f..7ca92497ccbb3b855349dc358712d38c355589fd 100644 (file)
--- a/clients/utilities.h
+++ b/clients/utilities.h
@@ -1,8 +1,6 @@
-#include <memcached.h>
 #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>
@@ -15,6 +13,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 
@@ -25,8 +32,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);