buffer: make usable outside of ceph source again

Add a rados/buffer_fwd.h symlink and remove the "include/" prefix from
buffer.h.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f866e59c0453c24a3a56e5c0c395f072a9c70ad4..0057c774b4a4a6a17f99b935f3656dcdec4c6d8d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -403,6 +403,7 @@ install(FILES include/rados/librados.h
   include/rados/rados_types.hpp
   include/rados/librados.hpp
   include/buffer.h
+  include/buffer_fwd.h
   include/page.h
   include/crc32c.h
   DESTINATION include/rados)

diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index cd214555f6610284ffacc65d10b3812aa05d99cc..887ac55acb9b224ea98264776d47138dc272dba7 100644 (file)
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -104,6 +104,7 @@ noinst_HEADERS += \
        include/rados/page.h \
        include/rados/crc32c.h \
        include/rados/buffer.h \
+       include/rados/buffer_fwd.h \
        include/radosstriper/libradosstriper.h \
        include/radosstriper/libradosstriper.hpp \
        include/rbd/features.h \

diff --git a/src/include/buffer.h b/src/include/buffer.h
index 2f01260c151cbac63900011e106491c4d4e4c051..296235706b22d142d5978edc71836f27ba40dad4 100644 (file)
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -47,7 +47,7 @@
 
 #include "page.h"
 #include "crc32c.h"
-#include "include/buffer_fwd.h"
+#include "buffer_fwd.h"
 
 #ifdef __CEPH__
 # include "include/assert.h"

diff --git a/src/include/rados/buffer_fwd.h b/src/include/rados/buffer_fwd.h
new file mode 120000 (symlink)
index 0000000..bd1f6f1
--- /dev/null
+++ b/src/include/rados/buffer_fwd.h
@@ -0,0 +1 @@
+../buffer_fwd.h
\ No newline at end of file