From: David Zafman <david.zafman@inktank.com>
Date: Fri, 22 Feb 2013 00:04:24 +0000 (-0800)
Subject: Add rados_types.h header file
X-Git-Tag: v0.59~146^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bf5cf3318dd4c1af6409cdb01fe921f6ca215cf8;p=ceph.git

Add rados_types.h header file

Signed-off-by: David Zafman <david.zafman@inktank.com>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 60c3f2e5203d..9c453df1f53b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1182,6 +1182,7 @@ librbd_include_DATA = \
 rados_includedir = $(includedir)/rados
 rados_include_DATA = \
 	$(srcdir)/include/rados/librados.h \
+	$(srcdir)/include/rados/rados_types.h \
 	$(srcdir)/include/rados/librados.hpp \
 	$(srcdir)/include/buffer.h \
 	$(srcdir)/include/page.h \
@@ -1645,6 +1646,7 @@ noinst_HEADERS = \
 	include/uuid.h\
         include/xlist.h\
 	include/rados/librados.h\
+	include/rados/rados_types.h\
 	include/rados/librados.hpp\
 	include/rados/librgw.h\
 	include/rados/page.h\
diff --git a/src/include/rados/librados.h b/src/include/rados/librados.h
index d40d9b588c24..fec4bd6778cd 100644
--- a/src/include/rados/librados.h
+++ b/src/include/rados/librados.h
@@ -13,6 +13,7 @@ extern "C" {
 #include "include/inttypes.h"
 #endif
 #include <string.h>
+#include "include/rados/rados_types.h"
 
 #ifndef CEPH_OSD_TMAP_SET
 /* These are also defined in rados.h and objclass.h. Keep them in sync! */
diff --git a/src/include/rados/rados_types.h b/src/include/rados/rados_types.h
new file mode 100644
index 000000000000..a5579536b37d
--- /dev/null
+++ b/src/include/rados/rados_types.h
@@ -0,0 +1,16 @@
+#ifndef CEPH_RADOS_TYPES_H
+#define CEPH_RADOS_TYPES_H
+
+#include "include/inttypes.h"
+
+/**
+ * @struct obj_watch_t
+ * One item from list_watchers
+ */
+struct obj_watch_t {
+  int64_t watcher_id;
+  uint64_t cookie;
+  uint32_t timeout_seconds;
+}; 
+
+#endif
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index 9ff02f6ab938..692deba8c32e 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -24,6 +24,7 @@
 
 #include "common/admin_socket.h"
 #include "common/Timer.h"
+#include "include/rados/rados_types.h"
 
 #include <list>
 #include <map>