| Message ID | 1460932613-10522-1-git-send-email-wei.liu2@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Wei Liu writes ("[PATCH] [[for-4.7]] libxl: fix old style declarations"):
> Fix errors like:
>
> /local/work/xen.git/dist/install/usr/local/include/libxl_uuid.h:59:1: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration]
> void static inline libxl_uuid_copy_0x040400(libxl_uuid *dst,
> ^
> /local/work/xen.git/dist/install/usr/local/include/libxl_uuid.h:59:1: error: 'inline' is not at beginning of declaration [-Werror=old-style-declaration]
>
> /local/work/xen.git/dist/install/usr/local/include/libxl.h:1233:1: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration]
> int static inline libxl_domain_create_restore_0x040200(
> ^
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Thanks,
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
and queued with your release ack as discussed on irc.
Ian.
diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 3fc5c48..8ff5f31 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -1230,7 +1230,7 @@ int libxl_domain_create_restore(libxl_ctx *ctx, libxl_domain_config *d_config, #if defined(LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040400 -int static inline libxl_domain_create_restore_0x040200( +static inline int libxl_domain_create_restore_0x040200( libxl_ctx *ctx, libxl_domain_config *d_config, uint32_t *domid, int restore_fd, const libxl_asyncop_how *ao_how, @@ -1254,7 +1254,7 @@ int static inline libxl_domain_create_restore_0x040200( #elif defined(LIBXL_API_VERSION) && LIBXL_API_VERSION >= 0x040400 \ && LIBXL_API_VERSION < 0x040700 -int static inline libxl_domain_create_restore_0x040400( +static inline int libxl_domain_create_restore_0x040400( libxl_ctx *ctx, libxl_domain_config *d_config, uint32_t *domid, int restore_fd, const libxl_domain_restore_params *params, diff --git a/tools/libxl/libxl_uuid.h b/tools/libxl/libxl_uuid.h index 994320d..17c8b97 100644 --- a/tools/libxl/libxl_uuid.h +++ b/tools/libxl/libxl_uuid.h @@ -56,7 +56,7 @@ int libxl_uuid_from_string(libxl_uuid *uuid, const char *in); void libxl_uuid_copy(libxl_ctx *ctx_opt, libxl_uuid *dst, const libxl_uuid *src); #if defined(LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040500 -void static inline libxl_uuid_copy_0x040400(libxl_uuid *dst, +static inline void libxl_uuid_copy_0x040400(libxl_uuid *dst, const libxl_uuid *src) { libxl_uuid_copy(NULL, dst, src);
Fix errors like: /local/work/xen.git/dist/install/usr/local/include/libxl_uuid.h:59:1: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration] void static inline libxl_uuid_copy_0x040400(libxl_uuid *dst, ^ /local/work/xen.git/dist/install/usr/local/include/libxl_uuid.h:59:1: error: 'inline' is not at beginning of declaration [-Werror=old-style-declaration] /local/work/xen.git/dist/install/usr/local/include/libxl.h:1233:1: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration] int static inline libxl_domain_create_restore_0x040200( ^ Signed-off-by: Wei Liu <wei.liu2@citrix.com> --- Cc: Ian Jackson <ian.jackson@eu.citrix.com> --- tools/libxl/libxl.h | 4 ++-- tools/libxl/libxl_uuid.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)