From 0065f76d53419ef3f9ce8950e8c095bc74c69bf8 Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Mon, 16 Sep 2019 17:23:40 +0200 Subject: [PATCH] headers: Remove __le16/__le32/__le64 These types should no longer be used; use ceph_le16/32/64 instead. Also removes the cmake check whether those types are provided by kernel headers (likewise for the __be types, which already were not used anywhere). Signed-off-by: Ulrich Weigand --- cmake/modules/CephChecks.cmake | 6 ------ src/include/config-h.in.cmake | 18 ------------------ src/include/int_types.h | 9 --------- 3 files changed, 33 deletions(-) diff --git a/cmake/modules/CephChecks.cmake b/cmake/modules/CephChecks.cmake index 2bc850456ad58..576971ed2a877 100644 --- a/cmake/modules/CephChecks.cmake +++ b/cmake/modules/CephChecks.cmake @@ -55,12 +55,6 @@ CHECK_INCLUDE_FILES("valgrind/helgrind.h" HAVE_VALGRIND_HELGRIND_H) include(CheckTypeSize) set(CMAKE_EXTRA_INCLUDE_FILES "linux/types.h") -CHECK_TYPE_SIZE(__be16 __BE16) -CHECK_TYPE_SIZE(__be32 __BE32) -CHECK_TYPE_SIZE(__be64 __BE64) -CHECK_TYPE_SIZE(__le16 __LE16) -CHECK_TYPE_SIZE(__le32 __LE32) -CHECK_TYPE_SIZE(__le64 __LE64) CHECK_TYPE_SIZE(__u8 __U8) CHECK_TYPE_SIZE(__u16 __U16) CHECK_TYPE_SIZE(__u32 __U32) diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake index 4cdb21e1e8199..80dc7a532d42c 100644 --- a/src/include/config-h.in.cmake +++ b/src/include/config-h.in.cmake @@ -39,24 +39,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_EXECINFO_H 1 -/* Define to 1 if the system has the type `__be16'. */ -#cmakedefine HAVE___BE16 1 - -/* Define to 1 if the system has the type `__be32'. */ -#cmakedefine HAVE___BE32 1 - -/* Define to 1 if the system has the type `__be64'. */ -#cmakedefine HAVE___BE64 1 - -/* Define to 1 if the system has the type `__le16'. */ -#cmakedefine HAVE___LE16 1 - -/* Define to 1 if the system has the type `__le32'. */ -#cmakedefine HAVE___LE32 1 - -/* Define to 1 if the system has the type `__le64'. */ -#cmakedefine HAVE___LE64 1 - /* Define to 1 if the system has the type `__s16'. */ #cmakedefine HAVE___S16 1 diff --git a/src/include/int_types.h b/src/include/int_types.h index 56b2723f3a5c0..3435cbcbe2aeb 100644 --- a/src/include/int_types.h +++ b/src/include/int_types.h @@ -41,15 +41,6 @@ typedef int64_t __s64; #endif #endif /* LINUX_TYPES_H */ -#define __bitwise__ - -typedef __u16 __bitwise__ __le16; -typedef __u16 __bitwise__ __be16; -typedef __u32 __bitwise__ __le32; -typedef __u32 __bitwise__ __be32; -typedef __u64 __bitwise__ __le64; -typedef __u64 __bitwise__ __be64; - #ifndef BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS #define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS #endif -- 2.47.3