diff options
| author | Stefan Weil <sw@weilnetz.de> | 2013-01-16 19:04:27 +0100 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-02-02 20:13:19 +0000 |
| commit | 7b2d9779818f4c0d4c31d3a0292bee1c4b633217 (patch) | |
| tree | 8189aea68cdae8fbf824930b972876c59a2f2ee1 | |
| parent | abd8d4a4d6dfea7ddea72f095f993e1de941614e (diff) | |
util: Fix compilation of envlist.c for MinGW
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.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rw-r--r-- | include/sysemu/os-win32.h | 2 | ||||
| -rw-r--r-- | 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 d0e9234d24..bf9edeb9ab 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 ff99fc44e9..ebc06cf0f3 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" |