]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
common: use include/types.h early on, otherwise Clang will error. 22493/head
authorWillem Jan Withagen <wjw@digiware.nl>
Sun, 10 Jun 2018 13:25:46 +0000 (15:25 +0200)
committerWillem Jan Withagen <wjw@digiware.nl>
Sun, 10 Jun 2018 13:28:59 +0000 (15:28 +0200)
This is due that FreeBSD does not have loff_t as type.
And with the wrong order of includes the standard linux typedef
is included and used.

In file included from /home/wjw/wip/src/common/buffer.cc:21:
/home/wjw/wip/src/include/buffer_raw.h:92:41: error: unknown type name 'loff_t'; did you mean 'off_t'?
    virtual int zero_copy_to_fd(int fd, loff_t *offset) {
                                        ^~~~~~
                                        off_t
/usr/include/sys/uio.h:49:17: note: 'off_t' declared here
typedef __off_t off_t;
                ^
1 error generated.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
src/common/buffer.cc

index b60fbe99ff50be8796a7b99e3e2d82017804571a..3d01a460af2f406e7aebad596b19c200812aeb99 100644 (file)
@@ -18,6 +18,7 @@
 
 #include <sys/uio.h>
 
+#include "include/types.h"
 #include "include/buffer_raw.h"
 #include "include/compat.h"
 #include "include/mempool.h"
@@ -30,7 +31,6 @@
 #include "common/valgrind.h"
 #include "common/deleter.h"
 #include "common/RWLock.h"
-#include "include/types.h"
 #include "include/spinlock.h"
 #include "include/scope_guard.h"