From: Matt Benjamin <matt@linuxbox.com>
Date: Mon, 23 Jun 2014 23:16:26 +0000 (-0400)
Subject: Fixup int_types.h.
X-Git-Tag: v0.93~265^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3ce683a3081b4e0f57191c86ac94c9b74b4b52c0;p=ceph.git

Fixup int_types.h.

Signed-off-by: Matt Benjamin <matt@cohortfs.com>
---

diff --git a/src/crush/crush.h b/src/crush/crush.h
index 712d534f7a3..8ce14697650 100644
--- a/src/crush/crush.h
+++ b/src/crush/crush.h
@@ -3,12 +3,6 @@
 
 #include "include/int_types.h"
 
-#if defined(__linux__)
-#include <linux/types.h>
-#elif defined(__FreeBSD__)
-#include <sys/types.h>
-#endif
-
 /*
  * CRUSH is a pseudo-random data distribution algorithm that
  * efficiently distributes input values (typically, data objects)
diff --git a/src/include/buffer.h b/src/include/buffer.h
index fa5cfd08233..6f9adda789d 100644
--- a/src/include/buffer.h
+++ b/src/include/buffer.h
@@ -14,11 +14,7 @@
 #ifndef CEPH_BUFFER_H
 #define CEPH_BUFFER_H
 
-#if defined(__linux__)
-#include <stdlib.h>
-#include <linux/types.h>
-#elif defined(__FreeBSD__)
-#include <sys/types.h>
+#if defined(__linux__) || defined(__FreeBSD__)
 #include <stdlib.h>
 #endif
 
diff --git a/src/include/int_types.h b/src/include/int_types.h
index ec71b64c1bd..2ffb162cc24 100644
--- a/src/include/int_types.h
+++ b/src/include/int_types.h
@@ -58,6 +58,7 @@
 #include <sys/types.h>
 #endif
 
+#ifndef HAVE_LINUX_TYPES_H
 #ifndef HAVE___U8
 typedef uint8_t __u8;
 #endif
@@ -89,6 +90,7 @@ typedef uint64_t __u64;
 #ifndef HAVE___S64
 typedef int64_t __s64;
 #endif
+#endif /* LINUX_TYPES_H */
 
 #define __bitwise__
 
diff --git a/src/include/rbd_types.h b/src/include/rbd_types.h
index 51720c01c65..558bbaada8b 100644
--- a/src/include/rbd_types.h
+++ b/src/include/rbd_types.h
@@ -13,12 +13,6 @@
 #ifndef CEPH_RBD_TYPES_H
 #define CEPH_RBD_TYPES_H
 
-#if defined(__linux__)
-#include <linux/types.h>
-#elif defined(__FreeBSD__)
-#include <sys/types.h>
-#endif
-
 #include "rbd/features.h"
 
 /* New-style rbd image 'foo' consists of objects
diff --git a/src/mds/locks.c b/src/mds/locks.c
index f367eda29d2..aa612367c8a 100644
--- a/src/mds/locks.c
+++ b/src/mds/locks.c
@@ -5,12 +5,6 @@ typedef char bool;
 
 #include "include/int_types.h"
 
-#include <netinet/in.h>
-#if defined(__linux__)
-#include <linux/types.h>
-#elif defined(__FreeBSD__)
-#include <sys/types.h>
-#endif
 #include <string.h>
 #include <fcntl.h>