On Wed, Jan 16, 2013 at 6:04 PM, Stefan Weil <s...@weilnetz.de> wrote:
> MinGW has no strtok_r, so we need a declaration in sysemu/os-win32.h.
> We must also fix the include statements in util/envlist.c to include
> that file.
>
> We currently don't need an implementation of strtok_r because the
> code is compiled but not linked for MinGW.
I think it would be better to fix the build system so that unnecessary
files are not compiled.
>
> Signed-off-by: Stefan Weil <s...@weilnetz.de>
> ---
> include/sysemu/os-win32.h | 2 ++
> util/envlist.c | 7 +------
> 2 files changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/include/sysemu/os-win32.h b/include/sysemu/os-win32.h
> index d0e9234..bf9edeb 100644
> --- a/include/sysemu/os-win32.h
> +++ b/include/sysemu/os-win32.h
> @@ -73,6 +73,8 @@ struct tm *gmtime_r(const time_t *timep, struct tm *result);
> #undef localtime_r
> struct tm *localtime_r(const time_t *timep, struct tm *result);
>
> +char *strtok_r(char *str, const char *delim, char **saveptr);
> +
> static inline void os_setup_signal_handling(void) {}
> static inline void os_daemonize(void) {}
> static inline void os_setup_post(void) {}
> diff --git a/util/envlist.c b/util/envlist.c
> index ff99fc4..ebc06cf 100644
> --- a/util/envlist.c
> +++ b/util/envlist.c
> @@ -1,9 +1,4 @@
> -#include <assert.h>
> -#include <errno.h>
> -#include <stdlib.h>
> -#include <string.h>
> -#include <unistd.h>
> -
> +#include "qemu-common.h"
> #include "qemu/queue.h"
> #include "qemu/envlist.h"
>
> --
> 1.7.10.4
>
>
