]> git.proxmox.com Git - ovs.git/commitdiff
compat: Remove HAVE_BOOL_TYPE
authorGreg Rose <gvrose8192@gmail.com>
Thu, 30 Jan 2020 23:55:27 +0000 (15:55 -0800)
committerBen Pfaff <blp@ovn.org>
Fri, 31 Jan 2020 16:15:40 +0000 (08:15 -0800)
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>
Signed-off-by: Ben Pfaff <blp@ovn.org>
acinclude.m4
datapath/linux/compat/include/linux/stddef.h
datapath/linux/compat/include/linux/types.h

index c1470ccc6bc4eb74fb2517d06ae49145a97144d5..1212a463eaa9330197e433fb35855794a87ed387 100644 (file)
@@ -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],
index f2b7c319aa857f23b6f79ad877a9d65db5651875..5b44c0dee4eeac54eab9509d5a05da277f3b8c2c 100644 (file)
@@ -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))
index b989d96c38ef18dccf0fee557d89484e185bdd23..a58623e70b8ff9d6faf44d07c5dbe237e1f9aa9e 100644 (file)
@@ -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