wxx patch queue
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABCAAGBQJWW+MxAAoJEOCMIdVndFCtGhYQAIfazbA61o4HPUDHDjvELcm1 7+Osu16c8pDgyuYoMZXQI3S9e6SugnVCF416LZ4xk9U4Tl2/7RXgxb0Yk46BoIXx t3b0zlCmopBxYUqCzfrZ+Ncy7uPttXeOUJ2l9SxZQY0cwHPXmZcsW59o1VWhVhKl EE6u1Yi//4MDeXgJQ2c+YQ8n5E/vdgLtKR3lUUV9o8xnHflE9hjwG1W7A8W/axgg Z3aVdL/sgiBcVQDuEqwNCZ0LcGlmL7NeEAHuTevll6Rzb/O4R+uhxvk1yv6LyXZs +/tlAyNA/Atedv7miqBsnXvQ0in+xf1fMJhfAiTte8o/wA+HgXzedg+p7M7eQrtR iWac+A/hgqg/EYBN/48ZkTQ4bBo7k5Vuh0SUcktMzExmQCgacsAH/B6gpqnkN3ps i80tlCME+voI596vEa6pLJXsPNmAo/LEo6Nd4JJ/Cp3RwljFc+8T9CF+K0cIYeUl x+mf4ULwgEL/Ix0u3INCCwH45o7KWg0hDjs4oGnjUgfe29CDlXI7aKfT2MjvjJlO th3cq4vL3bX1z3F6ZJ2b4xifmWSy6X4LrKeIYTLBaUNUnMbyuV0yJswsPU84DbJB RxkIKw7JVITFdfNuFnFnabcZ/lvlaIrSBksAPFMD27HWyS/bW8c1JoNAJf04OqU/ 36CAparz1QYJVEw3+xhA =JQbu -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20151130' into staging wxx patch queue # gpg: Signature made Mon 30 Nov 2015 05:48:33 GMT using RSA key ID 677450AD # gpg: Good signature from "Stefan Weil <sw@weilnetz.de>" # gpg: aka "Stefan Weil <stefan.weil@weilnetz.de>" # gpg: aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>" # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2 B78A E08C 21D5 6774 50AD * remotes/weil/tags/pull-wxx-20151130: w32: Use gcc option -mthreads oslib-win32: Change return type of function getpagesize trace/simple: Fix warning and wrong trace file name for MinGW Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
680617ed43
2
configure
vendored
2
configure
vendored
|
@ -727,6 +727,8 @@ if test "$mingw32" = "yes" ; then
|
||||||
QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS"
|
QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS"
|
||||||
# enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later)
|
# enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later)
|
||||||
QEMU_CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $QEMU_CFLAGS"
|
QEMU_CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $QEMU_CFLAGS"
|
||||||
|
# MinGW needs -mthreads for TLS and macro _MT.
|
||||||
|
QEMU_CFLAGS="-mthreads $QEMU_CFLAGS"
|
||||||
LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS"
|
LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS"
|
||||||
write_c_skeleton;
|
write_c_skeleton;
|
||||||
if compile_prog "" "-liberty" ; then
|
if compile_prog "" "-liberty" ; then
|
||||||
|
|
|
@ -87,7 +87,7 @@ static inline void os_setup_post(void) {}
|
||||||
void os_set_line_buffering(void);
|
void os_set_line_buffering(void);
|
||||||
static inline void os_set_proc_name(const char *dummy) {}
|
static inline void os_set_proc_name(const char *dummy) {}
|
||||||
|
|
||||||
size_t getpagesize(void);
|
int getpagesize(void);
|
||||||
|
|
||||||
#if !defined(EPROTONOSUPPORT)
|
#if !defined(EPROTONOSUPPORT)
|
||||||
# define EPROTONOSUPPORT EINVAL
|
# define EPROTONOSUPPORT EINVAL
|
||||||
|
|
|
@ -329,7 +329,8 @@ bool st_set_trace_file(const char *file)
|
||||||
g_free(trace_file_name);
|
g_free(trace_file_name);
|
||||||
|
|
||||||
if (!file) {
|
if (!file) {
|
||||||
trace_file_name = g_strdup_printf(CONFIG_TRACE_FILE, getpid());
|
/* Type cast needed for Windows where getpid() returns an int. */
|
||||||
|
trace_file_name = g_strdup_printf(CONFIG_TRACE_FILE, (pid_t)getpid());
|
||||||
} else {
|
} else {
|
||||||
trace_file_name = g_strdup_printf("%s", file);
|
trace_file_name = g_strdup_printf("%s", file);
|
||||||
}
|
}
|
||||||
|
|
|
@ -454,7 +454,7 @@ gint g_poll(GPollFD *fds, guint nfds, gint timeout)
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t getpagesize(void)
|
int getpagesize(void)
|
||||||
{
|
{
|
||||||
SYSTEM_INFO system_info;
|
SYSTEM_INFO system_info;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue