Re: [Qemu-devel] [PATCH] w64: Don't redefine lseek, ftruncate

[Blue Swirl]

Thanks, applied.

On Sat, Mar 10, 2012 at 10:14, Stefan Weil <address@hidden> wrote:
> MinGW-w64 already defines lseek and ftruncate (and uses the 64 bit
> variants). The conditional compilation avoids redefinitions
> (which would be wrong) and compiler warnings.
>
> Signed-off-by: Stefan Weil <address@hidden>
> ---
>  qemu-common.h |    8 ++++++--
>  1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/qemu-common.h b/qemu-common.h
> index dbfce6f..b0fdf5c 100644
> --- a/qemu-common.h
> +++ b/qemu-common.h
> @@ -93,9 +93,13 @@ typedef int (*fprintf_function)(FILE *f, const char *fmt, 
> ...)
>
>  #ifdef _WIN32
>  #define fsync _commit
> -#define lseek _lseeki64
> +#if !defined(lseek)
> +# define lseek _lseeki64
> +#endif
>  int qemu_ftruncate64(int, int64_t);
> -#define ftruncate qemu_ftruncate64
> +#if !defined(ftruncate)
> +# define ftruncate qemu_ftruncate64
> +#endif
>
>  static inline char *realpath(const char *path, char *resolved_path)
>  {
> --
> 1.7.9
>
>