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 712d534f7a35e0d141792c89537d8d08a4d2f3d1..8ce1469765001551e91c8fc514f0dbaf5364f5d3 100644 (file)
--- 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 fa5cfd08233ec4e6be92020491d1b7ebcadd9b51..6f9adda789d67975891020ede747e109f401da33 100644 (file)
--- 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 ec71b64c1bd5a8c2fc718735e04d357710f5ef30..2ffb162cc24ee9f86b3639ad194c67f6ebb2a7d1 100644 (file)
--- 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 51720c01c65bdc732b27d8ac50224020110dd166..558bbaada8b1978cd45444f20a72707c450d3a34 100644 (file)
--- 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 f367eda29d23d97a51465325f11b3074885d18a4..aa612367c8a115bfcc8eadad4a19ee779cd5e30e 100644 (file)
--- 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>