attempt to fix #12, #49 and #65

[awesomized/libmemcached] / clients / utilities.h

diff --git a/clients/utilities.h b/clients/utilities.h
index 685be6a5443d07d693ff3b1c5f6838b72446791f..a9f199d5e48115e13fb7cd817e02f81310615c0d 100644 (file)
--- a/clients/utilities.h
+++ b/clients/utilities.h
@@ -12,21 +12,18 @@
 #pragma once
 
 #include <getopt.h>
-#include <libmemcached/memcached.h>
-#include "libmemcached/watchpoint.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*
@@ -50,14 +47,15 @@ extern "C" {
 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"