X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Futilities.h;h=685be6a5443d07d693ff3b1c5f6838b72446791f;hb=026339d350e4cbec41951eea4d64bda5caf9febc;hp=ea0be2ea42234ab55ea7b09c3b320e939001ee79;hpb=a4822a8fac8aa8fe0206a4f5ea64778ef1a09755;p=awesomized%2Flibmemcached

diff --git a/clients/utilities.h b/clients/utilities.h
index ea0be2ea..685be6a5 100644
--- a/clients/utilities.h
+++ b/clients/utilities.h
@@ -1,5 +1,19 @@
+/* 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:
+ *
+ */
+
+#pragma once
+
 #include <getopt.h>
 #include <libmemcached/memcached.h>
+#include "libmemcached/watchpoint.h"
 #include "client_options.h"
 
 #if TIME_WITH_SYS_TIME
@@ -13,18 +27,38 @@
 # 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 
+struct memcached_programs_help_st
 {
   char *not_used_yet;
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 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);
+bool initialize_sasl(memcached_st *memc, char *user, char *password);
+void shutdown_sasl(void);
+void initialize_sockets(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif