merge.

[m6w6/libmemcached] / libmemcached / memcached_util.h

diff --git a/libmemcached/memcached_util.h b/libmemcached/memcached_util.h
index 65732c87f438919738c9cfd170b4a19da11a7650..a20b665b4bdd8df9c383db2eeb4f683e7043c0d5 100644 (file)
--- a/libmemcached/memcached_util.h
+++ b/libmemcached/memcached_util.h
@@ -1,15 +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
 
-#include <libmemcached/memcached_pool.h>
+#ifndef __LIBMEMCACHED__MEMCACHED_UTIL_H__
+#define __LIBMEMCACHED__MEMCACHED_UTIL_H__
+
+#include <libmemcached/util/pool.h>
 
-#endif /* MEMCACHED_UTIL_H */
+#endif /* __LIBMEMCACHED__MEMCACHED_UTIL_H__ */