From b821a4bc1100aee884185d94c9df09cfb961dc6b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 12 May 2009 08:07:00 -0700 Subject: [PATCH] testrados: C, not C++ --- src/Makefile.am | 2 +- src/include/librados.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 5fd699bcd64ad..0c3697b0844da 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -109,7 +109,7 @@ librados_la_CFLAGS = ${AM_CFLAGS} librados_la_CXXFLAGS = ${AM_CXXFLAGS} lib_LTLIBRARIES += librados.la -testrados_SOURCES = testrados.cc +testrados_SOURCES = testrados.c testrados_LDADD = librados.la libcrush.la diff --git a/src/include/librados.h b/src/include/librados.h index e00dc6b6278e5..538156a17301c 100644 --- a/src/include/librados.h +++ b/src/include/librados.h @@ -8,6 +8,7 @@ extern "C" { #include #include #include +#include #include "include/msgr.h" #include "include/rados.h" @@ -17,8 +18,8 @@ int rados_initialize(int argc, const char **argv); /* arguments are optional */ void rados_deinitialize(); /* read/write objects */ -int rados_write(ceph_object *oid, const char *buf, off_t off, size_t len); -int rados_read(ceph_object *oid, char *buf, off_t off, size_t len); +int rados_write(struct ceph_object *oid, const char *buf, off_t off, size_t len); +int rados_read(struct ceph_object *oid, char *buf, off_t off, size_t len); #ifdef __cplusplus } -- 2.39.5