[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH for-4.5] libxl: expose #define to 4.5 and above
On 03/12/14 10:41, Wei Liu wrote: > 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.liu2@xxxxxxxxxx> > Cc: Ian Campbell <ian.campbell@xxxxxxxxxx> > Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx> Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> > --- > 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 */ _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |