Fixup int_types.h.

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

Conflicts:
	src/include/rados/librados.h

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

Author: mattbenjamin

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)

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
 

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__
 

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

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>