X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Futilities.h;h=a9f199d5e48115e13fb7cd817e02f81310615c0d;hb=bb98ce33936edc0dc914652c0227f95727518b16;hp=162366ab82d48403cbb11dc1b92c9254b56d0719;hpb=519261ca98528ebc5d854ed839f400aa03a3dc5c;p=awesomized%2Flibmemcached

diff --git a/clients/utilities.h b/clients/utilities.h
index 162366ab..a9f199d5 100644
--- a/clients/utilities.h
+++ b/clients/utilities.h
@@ -9,21 +9,21 @@
  *
  */
 
+#pragma once
+
 #include <getopt.h>
-#include <libmemcached/memcached.h>
-#include "client_options.h"
+#include <libmemcached-1.0/memcached.h>
+#include "clients/client_options.h"
 
-#if TIME_WITH_SYS_TIME
+#if defined(HAVE_SYS_TIME_H)
 # include <sys/time.h>
+#endif
+
+#if defined(HAVE_TIME_H)
 # include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
 
+
 #ifdef __sun
   /* For some odd reason the option struct on solaris defines the argument
    * as char* and not const char*
@@ -40,13 +40,23 @@ 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(const char *command_name);
+void version_command(const char *command_name) __attribute__ ((noreturn));
 void help_command(const char *command_name, const char *description,
                   const struct option *long_options,
-                  memcached_programs_help_st *options);
+                  memcached_programs_help_st *options) __attribute__ ((noreturn));
 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);
+void close_stdio(void);
+
+#ifdef __cplusplus
+} // extern "C"
+#endif