diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-18 09:29:58 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-18 09:29:58 +0100 |
| commit | 72ba71645132923bb8e0b93f7683aef8bc485aa2 (patch) | |
| tree | baeaeff7e7ce5bf65f056625b435b8d55d4a04fa /pixman | |
| parent | 4d64875593956234795d9947ac1d225e5b110f0f (diff) | |
| parent | 7c20de6c7fb53ed404d4df0d975328318810ce01 (diff) | |
| download | vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.tar.gz vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.tar.bz2 vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libXext mesa xkeyboard-config pixman 18 nov 2013
Conflicts:
libXext/src/eat.h
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/test/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pixman/test/utils.c b/pixman/test/utils.c index 281f6b4e2..ebe0ccc09 100644 --- a/pixman/test/utils.c +++ b/pixman/test/utils.c @@ -648,7 +648,7 @@ call_test_function (uint32_t (*test_function)(int testnum, int verbose), { uint32_t retval; -#if defined (__GNUC__) && (defined (__i386) || defined (__i386__)) +#if defined (__GNUC__) && defined (_WIN32) && (defined (__i386) || defined (__i386__)) __asm__ ( /* Deliberately avoid aligning the stack to 16 bytes */ "pushl %1\n\t" |