X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Futilities.h;h=a9f199d5e48115e13fb7cd817e02f81310615c0d;hb=538ce08e1871cfa9e409455fd82f9f948635c135;hp=d036bccc1aec107f58f1a651095aa8098dd0cf40;hpb=fee8381b6b80398fcb6893860400ead6a598f15b;p=awesomized%2Flibmemcached

diff --git a/clients/utilities.h b/clients/utilities.h
index d036bccc..a9f199d5 100644
--- a/clients/utilities.h
+++ b/clients/utilities.h
@@ -15,17 +15,15 @@
 #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*
@@ -49,10 +47,10 @@ 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);