[ovs-dev] [PATCH] compat: Fix RHEL7 build.
Ben Pfaff
blp at nicira.com
Wed Mar 25 01:40:03 UTC 2015
On Tue, Mar 24, 2015 at 04:59:44PM -0700, Joe Stringer wrote:
> Tested against 3.10.0-229.el7.x86_64.
>
> Signed-off-by: Joe Stringer <joestringer at nicira.com>
> ---
> acinclude.m4 | 48 ++++++++++++++++++++++++-
> datapath/compat.h | 6 ++--
> datapath/linux/compat/genetlink-openvswitch.c | 2 +-
> datapath/linux/compat/include/linux/skbuff.h | 5 ++-
> datapath/linux/compat/include/net/genetlink.h | 6 +++-
> datapath/linux/compat/include/net/ip.h | 2 +-
> datapath/linux/compat/include/net/udp.h | 19 ++++++++--
> datapath/linux/compat/udp.c | 2 +-
> 8 files changed, 78 insertions(+), 12 deletions(-)
>
> diff --git a/acinclude.m4 b/acinclude.m4
> index 5ed70c1..479da2e 100644
> --- a/acinclude.m4
> +++ b/acinclude.m4
> @@ -254,6 +254,37 @@ AC_DEFUN([OVS_GREP_IFELSE], [
> fi
> ])
>
> +dnl OVS_FIND_FIELD_IFELSE(FILE, STRUCTURE, REGEX, [IF-MATCH], [IF-NO-MATCH])
> +dnl
> +dnl Looks for STRUCTURE in FILE. If it is found, greps for REGEX within the
> +dnl structure definition. If this is successful, runs IF-MATCH, otherwise
> +dnl IF_NO_MATCH. If IF-MATCH is empty then it defines to
> +dnl OVS_DEFINE(HAVE_<STRUCTURE>_WITH_<REGEX>), with <STRUCTURE> and <REGEX>
> +dnl translated to uppercase.
> +AC_DEFUN([OVS_FIND_FIELD_IFELSE], [
> + AC_MSG_CHECKING([whether $2 has member $3 in $1])
I admire this macro.
Jesse or Pravin is probably better to actually review its usage.
More information about the dev
mailing list