[ovs-dev] [PATCH 2/2] string: Use workaround for #include_next when it is not available.

[Alin Serdean]

I applied the patches and everything seems in order.

The same remark about adding string.h to lib/.gitignore

Thanks,
Alin.
________________________________________
From: dev-bounces at openvswitch.org [dev-bounces at openvswitch.org] on behalf of Gurucharan Shetty [shettyg at nicira.com]
Sent: Thursday, December 12, 2013 9:30 PM
To: Ben Pfaff
Cc: dev
Subject: Re: [ovs-dev] [PATCH 2/2] string: Use workaround for #include_next when it is not available.

On Wed, Dec 11, 2013 at 3:04 PM, Ben Pfaff <blp at nicira.com> wrote:
> Signed-off-by: Ben Pfaff <blp at nicira.com>
> ---
>  configure.ac                  |    3 +++
>  lib/automake.mk               |    2 +-
>  lib/{string.h => string.h.in} |    4 ++--
>  3 files changed, 6 insertions(+), 3 deletions(-)
>  rename lib/{string.h => string.h.in} (93%)

Looks good to me. I tested this on windows using MSVC.
I think you will have to add string.h to .gitignore.
>
> diff --git a/configure.ac b/configure.ac
> index 167cc71..04becad 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -92,6 +92,9 @@ OVS_CHECK_ATOMIC_ALWAYS_LOCK_FREE(8)
>  OVS_CHECK_POSIX_AIO
>  OVS_CHECK_PTHREAD_SET_NAME
>
> +OVS_CHECK_INCLUDE_NEXT([string.h])
> +AC_CONFIG_FILES([lib/string.h])
> +
>  OVS_ENABLE_OPTION([-Wall])
>  OVS_ENABLE_OPTION([-Wextra])
>  OVS_ENABLE_OPTION([-Wno-sign-compare])
> diff --git a/lib/automake.mk b/lib/automake.mk
> index fadc4be..fef8212 100644
> --- a/lib/automake.mk
> +++ b/lib/automake.mk
> @@ -192,7 +192,6 @@ lib_libopenvswitch_a_SOURCES = \
>         lib/stream.c \
>         lib/stream.h \
>         lib/string.c \
> -       lib/string.h \
>         lib/svec.c \
>         lib/svec.h \
>         lib/table.c \
> @@ -230,6 +229,7 @@ lib_libopenvswitch_a_SOURCES = \
>         lib/vswitch-idl.h \
>         lib/vtep-idl.c \
>         lib/vtep-idl.h
> +EXTRA_DIST += lib/string.h.in
>
>  nodist_lib_libopenvswitch_a_SOURCES = \
>         lib/dirs.c
> diff --git a/lib/string.h b/lib/string.h.in
> similarity index 93%
> rename from lib/string.h
> rename to lib/string.h.in
> index 2b7b454..6e2c2ba 100644
> --- a/lib/string.h
> +++ b/lib/string.h.in
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (c) 2009, 2011 Nicira, Inc.
> + * Copyright (c) 2009, 2011, 2013 Nicira, Inc.
>   *
>   * Licensed under the Apache License, Version 2.0 (the "License");
>   * you may not use this file except in compliance with the License.
> @@ -17,7 +17,7 @@
>  #ifndef STRING_WRAPPER_H
>  #define STRING_WRAPPER_H 1
>
> -#include_next <string.h>
> +#@INCLUDE_NEXT@ @NEXT_STRING_H@
>
>  /* Glibc 2.7 has a bug in strtok_r when compiling with optimization that can
>   * cause segfaults if the delimiters argument is a compile-time constant that
> --
> 1.7.10.4
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
_______________________________________________
dev mailing list
dev at openvswitch.org
http://openvswitch.org/mailman/listinfo/dev