Merged up with build.

[m6w6/libmemcached] / libmemcached / memcached_util.h

diff --git a/libmemcached/memcached_util.h b/libmemcached/memcached_util.h
index ec8afa80ecf49717d05ab969a3be93dfeec98975..0c2c6777e56136ceabaa030f082943572cd1fb78 100644 (file)
--- a/libmemcached/memcached_util.h
+++ b/libmemcached/memcached_util.h
@@ -1,23 +1,20 @@
-/*
- * Summary: interface for libmemcached utility library
- * Description: main include file for libmemcachedutil
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
  *
- * Copy: See Copyright for the status of this software.
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary: Connection pool library.
  *
  * Author: Trond Norbye
+ *
  */
 
+
 #ifndef MEMCACHED_UTIL_H
 #define MEMCACHED_UTIL_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <libmemcached/memcached_pool.h>
-
-#ifdef __cplusplus
-}
-#endif
+#include <libmemcached/util/pool.h>
 
 #endif /* MEMCACHED_UTIL_H */