[ovs-dev] compat: Remove HAVE_BOOL_TYPE
diff mbox series

Message ID 1580428527-29483-1-git-send-email-gvrose8192@gmail.com
State New
Headers show
Series
  • [ovs-dev] compat: Remove HAVE_BOOL_TYPE
Related show

Commit Message

Greg Rose Jan. 30, 2020, 11:55 p.m. UTC
OVS only supports Linux kernels since 3.10 and all kernels since
then have the bool type.  This check is unnecessary so remove it.

Passes Travis:
https://travis-ci.org/gvrose8192/ovs-experimental/builds/644103253

Signed-off-by: Greg Rose <gvrose8192@gmail.com>
---
 acinclude.m4                                 | 2 --
 datapath/linux/compat/include/linux/stddef.h | 7 -------
 datapath/linux/compat/include/linux/types.h  | 4 ----
 3 files changed, 13 deletions(-)

Comments

Ben Pfaff Jan. 31, 2020, 4:16 p.m. UTC | #1
On Thu, Jan 30, 2020 at 03:55:27PM -0800, Greg Rose wrote:
> OVS only supports Linux kernels since 3.10 and all kernels since
> then have the bool type.  This check is unnecessary so remove it.
> 
> Passes Travis:
> https://travis-ci.org/gvrose8192/ovs-experimental/builds/644103253
> 
> Signed-off-by: Greg Rose <gvrose8192@gmail.com>

Applied to master, thanks!

Patch
diff mbox series

diff --git a/acinclude.m4 b/acinclude.m4
index c1470cc..1212a46 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -830,8 +830,6 @@  AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_nfct])
   OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_put_zero])
 
-  OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [bool],
-                  [OVS_DEFINE([HAVE_BOOL_TYPE])])
   OVS_GREP_IFELSE([$KSRC/include/linux/types.h], [__wsum],
                   [OVS_DEFINE([HAVE_CSUM_TYPES])])
   OVS_GREP_IFELSE([$KSRC/include/uapi/linux/types.h], [__wsum],
diff --git a/datapath/linux/compat/include/linux/stddef.h b/datapath/linux/compat/include/linux/stddef.h
index f2b7c31..5b44c0d 100644
--- a/datapath/linux/compat/include/linux/stddef.h
+++ b/datapath/linux/compat/include/linux/stddef.h
@@ -5,13 +5,6 @@ 
 
 #ifdef __KERNEL__
 
-#ifndef HAVE_BOOL_TYPE
-enum {
-	false   = 0,
-	true    = 1
-};
-#endif /* !HAVE_BOOL_TYPE */
-
 #ifndef offsetofend
 #define offsetofend(TYPE, MEMBER) \
 	(offsetof(TYPE, MEMBER)	+ sizeof(((TYPE *)0)->MEMBER))
diff --git a/datapath/linux/compat/include/linux/types.h b/datapath/linux/compat/include/linux/types.h
index b989d96..a58623e 100644
--- a/datapath/linux/compat/include/linux/types.h
+++ b/datapath/linux/compat/include/linux/types.h
@@ -8,8 +8,4 @@  typedef __u16 __bitwise __sum16;
 typedef __u32 __bitwise __wsum;
 #endif
 
-#ifndef HAVE_BOOL_TYPE
-typedef _Bool bool;
-#endif /* !HAVE_BOOL_TYPE */
-
 #endif