Merge up to gearmand.

[m6w6/libmemcached] / libtest / gearmand.h

diff --git a/libtest/gearmand.h b/libtest/gearmand.h
index 6d311ead55efdb9cb6f75c794b7b77ecc708ad8e..49c08c9f6b723e50b01fd3b7586bbe59dc2593cf 100644 (file)
--- a/libtest/gearmand.h
+++ b/libtest/gearmand.h
@@ -1,8 +1,8 @@
 /*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- * 
- *  libtest
  *
- *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Data Differential YATL (i.e. libtest)  library
+ *
+ *  Copyright (C) 2012 Data Differential, http://datadifferential.com/
  *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions are
@@ -36,8 +36,14 @@
 
 #pragma once
 
+#include <arpa/inet.h>
+
+namespace libtest { struct Server; }
+
 namespace libtest {
 
-Server *build_gearmand(const char *hostname, in_port_t try_port);
+libtest::Server *build_gearmand(const char *hostname, in_port_t try_port);
+
+libtest::Server *build_gearmand(const char *hostname, in_port_t try_port, const char* binary);
 
 }