In e3abab74 (libxl: un-constify return value of libxl_basename), the macro was exposed to releases < 4.5. However only new code is able to make use of that macro so it should be exposed to releases >= 4.5.
Signed-off-by: Wei Liu <wei.l...@citrix.com> Cc: Ian Campbell <ian.campb...@citrix.com> Cc: Ian Jackson <ian.jack...@eu.citrix.com> Cc: Andrew Cooper <andrew.coop...@citrix.com> --- tools/libxl/libxl.h | 6 +++--- tools/libxl/libxl_utils.c | 2 +- tools/libxl/libxl_utils.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 291c190..0a123f1 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -478,13 +478,13 @@ typedef struct libxl__ctx libxl_ctx; #endif /* - * LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE + * LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE * * The return value of libxl_basename is malloc'ed but the erroneously * marked as "const" in releases before 4.5. */ -#if defined(LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040500 -#define LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE 1 +#if !defined(LIBXL_API_VERSION) || LIBXL_API_VERSION >= 0x040500 +#define LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE 1 #endif /* diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 22119fc..7095b58 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -19,7 +19,7 @@ #include "libxl_internal.h" -#ifdef LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE +#ifndef LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE const #endif char *libxl_basename(const char *name) diff --git a/tools/libxl/libxl_utils.h b/tools/libxl/libxl_utils.h index 8277eb9..acacdd9 100644 --- a/tools/libxl/libxl_utils.h +++ b/tools/libxl/libxl_utils.h @@ -18,7 +18,7 @@ #include "libxl.h" -#ifdef LIBXL_HAVE_CONST_LIBXL_BASENAME_RETURN_VALUE +#ifndef LIBXL_HAVE_NONCONST_LIBXL_BASENAME_RETURN_VALUE const #endif char *libxl_basename(const char *name); /* returns string from strdup */ -- 1.7.10.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel
