X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Futilities.cc;h=158890515ef43840bc9d49409e386bb0706ed980;hb=0b262a1571e2196e988a841d3449b5a4e0a2081a;hp=79f2f2aebcda1560a4750bc7f11175924fa1d0d3;hpb=c69776b7cf0d0c26b07abd83da8a797182ff6fae;p=awesomized%2Flibmemcached

diff --git a/clients/utilities.cc b/clients/utilities.cc
index 79f2f2ae..15889051 100644
--- a/clients/utilities.cc
+++ b/clients/utilities.cc
@@ -1,4 +1,5 @@
 /* LibMemcached
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
  * Copyright (C) 2006-2009 Brian Aker
  * All rights reserved.
  *
@@ -8,7 +9,7 @@
  * Summary:
  *
  */
-#include <config.h>
+#include <mem_config.h>
 
 #include <clients/utilities.h>
 
@@ -98,10 +99,12 @@ static const char *lookup_help(memcached_options option)
   case OPT_BINARY: return("Switch to binary protocol.");
   case OPT_ANALYZE: return("Analyze the provided servers.");
   case OPT_UDP: return("Use UDP protocol when communicating with server.");
+  case OPT_BUFFER: return("Enable request buffering.");
   case OPT_USERNAME: return "Username to use for SASL authentication";
   case OPT_PASSWD: return "Password to use for SASL authentication";
   case OPT_FILE: return "Path to file in which to save result";
   case OPT_STAT_ARGS: return "Argument for statistics";
+  case OPT_SERVER_VERSION: return "Memcached daemon software version";
   default:
                       break;
   };
@@ -181,12 +184,12 @@ void process_hash_option(memcached_st *memc, char *opt_hash)
 void initialize_sockets(void)
 {
   /* Define the function for all platforms to avoid #ifdefs in each program */
-#if defined(WIN32) && WIN32
+#if defined(_WIN32)
   WSADATA wsaData;
   if (WSAStartup(MAKEWORD(2,0), &wsaData) != 0)
   {
     fprintf(stderr, "Socket Initialization Error. Program aborted\n");
     exit(EXIT_FAILURE);
   }
-#endif
+#endif // #if defined(_WIN32)
 }