From: Padraig O'Sullivan <osullivan.padraig@gmail.com>
Date: Wed, 5 Aug 2009 02:24:40 +0000 (-0400)
Subject: Merged with trond's header file cleanup branch.
X-Git-Tag: 0.34~13^2~14
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=76b111e0882fb19b49bcade2715981e7d2f32ae1;p=m6w6%2Flibmemcached

Merged with trond's header file cleanup branch.
---

76b111e0882fb19b49bcade2715981e7d2f32ae1
diff --cc libmemcached/Makefile.am
index f192eda4,044276a0..21f00870
--- a/libmemcached/Makefile.am
+++ b/libmemcached/Makefile.am
@@@ -11,18 -11,28 +11,29 @@@ noinst_HEADERS = libmemcached_probes.h 
                   memcached/protocol_binary.h
  
  pkginclude_HEADERS= memcached.h \
 -                    memcached.hpp \
 +		    memcached.hpp \
 +		    exception.hpp \
+                     memcached_allocators.h \
+                     memcached_arithmetic.h \
+                     memcached_behavior.h \
+                     memcached_callback.h \
                      memcached_configure.h \
- 		    memcached_constants.h \
- 		    memcached_get.h \
- 		    memcached_result.h \
- 		    memcached_server.h \
- 		    memcached_storage.h \
- 		    memcached_string.h \
- 		    memcached_types.h \
- 		    memcached_watchpoint.h \
- 		    visibility.h
+                     memcached_constants.h \
+                     memcached_delete.h \
+                     memcached_dump.h \
+                     memcached_flush.h \
+                     memcached_flush_buffers.h \
+                     memcached_get.h \
+                     memcached_hash.h \
+                     memcached_result.h \
+                     memcached_server.h \
+                     memcached_st.h \
+                     memcached_stats.h \
+                     memcached_storage.h \
+                     memcached_string.h \
+                     memcached_types.h \
+                     memcached_watchpoint.h \
+                     visibility.h
  
  
  if BUILD_LIBMEMCACHEDUTIL
diff --cc libmemcached/memcached.hpp
index a101da34,23f6ea5b..76854e33
--- a/libmemcached/memcached.hpp
+++ b/libmemcached/memcached.hpp
@@@ -12,11 -12,10 +12,11 @@@
   * @brief Libmemcached C++ interface
   */
  
- #ifndef LIBMEMCACHEDPP_H
- #define LIBMEMCACHEDPP_H
+ #ifndef LIBMEMCACHED_MEMCACHED_HPP
+ #define LIBMEMCACHED_MEMCACHED_HPP
  
  #include <libmemcached/memcached.h>
 +#include <libmemcached/exception.hpp>
  
  #include <string.h>