Commit 2fc1c4b4 authored by Shane Snyder's avatar Shane Snyder

get everything compiling again

parent 8d25a0e2
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
extern "C" { extern "C" {
#endif #endif
#include <inttypes.h>
#include <time.h>
// derived from: http://docs.ceph.com/docs/master/mobject_store/api/libmobject_store/ // derived from: http://docs.ceph.com/docs/master/mobject_store/api/libmobject_store/
......
...@@ -24,7 +24,7 @@ typedef mobject_store_t rados_t; ...@@ -24,7 +24,7 @@ typedef mobject_store_t rados_t;
#define LIBRADOS_OPERATION_FULL_FORCE LIBMOBJECT_OPERATION_FULL_FORCE #define LIBRADOS_OPERATION_FULL_FORCE LIBMOBJECT_OPERATION_FULL_FORCE
#define LIBRADOS_OPERATION_IGNORE_REDIRECT LIBMOBJECT_OPERATION_IGNORE_REDIRECT #define LIBRADOS_OPERATION_IGNORE_REDIRECT LIBMOBJECT_OPERATION_IGNORE_REDIRECT
typedef mobject_store_ioctx rados_ioctx_t; typedef mobject_store_ioctx_t rados_ioctx_t;
typedef mobject_store_omap_iter_t rados_omap_iter_t; typedef mobject_store_omap_iter_t rados_omap_iter_t;
typedef mobject_store_write_op_t rados_write_op_t; typedef mobject_store_write_op_t rados_write_op_t;
typedef mobject_store_read_op_t rados_read_op_t; typedef mobject_store_read_op_t rados_read_op_t;
......
...@@ -19,7 +19,7 @@ struct mobject_store_handle ...@@ -19,7 +19,7 @@ struct mobject_store_handle
int test; int test;
}; };
int rados_create(rados_t *cluster, const char * const id) int mobject_store_create(mobject_store_t *cluster, const char * const id)
{ {
struct mobject_store_handle *cluster_handle; struct mobject_store_handle *cluster_handle;
(void)id; /* XXX: id unused in mobject */ (void)id; /* XXX: id unused in mobject */
...@@ -45,7 +45,7 @@ int mobject_store_connect(mobject_store_t cluster) ...@@ -45,7 +45,7 @@ int mobject_store_connect(mobject_store_t cluster)
} }
#endif #endif
void rados_shutdown(rados_t cluster) void mobject_store_shutdown(mobject_store_t cluster)
{ {
struct mobject_store_handle *cluster_handle = struct mobject_store_handle *cluster_handle =
(struct mobject_store_handle *)cluster; (struct mobject_store_handle *)cluster;
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include <librados.h> #include <librados.h>
#else #else
#include <libmobject-store.h> #include <libmobject-store.h>
#include <librados-mobject-store.h>
#endif #endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment