Merge up trunk

[m6w6/libmemcached] / libmemcached / memcached_util.h

diff --git a/libmemcached/memcached_util.h b/libmemcached/memcached_util.h
index 501b81ae6c0a515927684009c238fab50b733dd6..c0a4620af9aff1b3f396eea7997fa8a80d97a3bc 100644 (file)
--- a/libmemcached/memcached_util.h
+++ b/libmemcached/memcached_util.h
@@ -1,15 +1,45 @@
-/*
- * Summary: interface for libmemcached utility library
- * Description: main include file for libmemcachedutil
+/*  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ * 
+ *  Libmemcached library
  *
- * Copy: See Copyright for the status of this software.
+ *  Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ *  Copyright (C) 2006-2009 Brian Aker All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are
+ *  met:
+ *
+ *      * Redistributions of source code must retain the above copyright
+ *  notice, this list of conditions and the following disclaimer.
+ *
+ *      * Redistributions in binary form must reproduce the above
+ *  copyright notice, this list of conditions and the following disclaimer
+ *  in the documentation and/or other materials provided with the
+ *  distribution.
+ *
+ *      * The names of its contributors may not be used to endorse or
+ *  promote products derived from this software without specific prior
+ *  written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * Author: Trond Norbye
  */
 
-#ifndef LIBMEMCACHED_MEMCACHED_UTIL_H
-#define LIBMEMCACHED_MEMCACHED_UTIL_H
+#pragma once
 
-#include <libmemcached/memcached_pool.h>
 
-#endif /* LIBMEMCACHED_MEMCACHED_UTIL_H */
+#include <libmemcached/util/pid.h>
+#include <libmemcached/util/flush.h>
+#include <libmemcached/util/ping.h>
+#include <libmemcached/util/pool.h>
+#include <libmemcached/util/version.h>