diff options
| author | Christophe Fergeau <cfergeau@redhat.com> | 2012-02-21 22:41:00 +0100 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2012-02-21 22:41:00 +0100 |
| commit | c63032b6f054a40e16c0a70a646960b38393e12c (patch) | |
| tree | c347d065e5af2c3c10a02ae8cbe9d383ada72dca | |
| parent | d7c476e5f26e8bf847ee5a57c04703e5ab934f47 (diff) | |
mingw: disable inline ASM
| -rw-r--r-- | display/driver.c | 2 | ||||
| -rw-r--r-- | display/res.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/display/driver.c b/display/driver.c index a92eb03..c069ad0 100644 --- a/display/driver.c +++ b/display/driver.c @@ -246,7 +246,7 @@ BOOL DrvEnableDriver(ULONG engine_version, ULONG enable_data_size, PDRVENABLEDAT mspace_set_abort_func(mspace_abort); mspace_set_print_func(mspace_print); ResInitGlobals(); -#ifndef _WIN64 +#if !defined _WIN64 && !defined __MINGW32__ CheckAndSetSSE2(); #endif InitGlobalRes(); diff --git a/display/res.c b/display/res.c index ccbb110..e95f481 100644 --- a/display/res.c +++ b/display/res.c @@ -1039,7 +1039,7 @@ static BOOL SetClip(PDev *pdev, CLIPOBJ *clip, QXLDrawable *drawable) return TRUE; } -#ifndef _WIN64 +#if !defined _WIN64 && !defined __MINGW32__ static _inline void fast_memcpy_aligment(void *dest, const void *src, size_t len) { @@ -1279,7 +1279,7 @@ static void __PutBytesAlign(PDev *pdev, QXLDataChunk **chunk_ptr, UINT8 **now_pt NEW_DATA_CHUNK(page_counter, aligned_size); cp_size = (int)MIN(end - now, size); } -#ifndef _WIN64 +#if !defined _WIN64 && !defined __MINGW32__ if (use_sse) { offset = (size_t)now & SSE_MASK; if (offset) { @@ -1782,7 +1782,7 @@ static void FreeBitmapImage(PDev *pdev, Resource *res) // todo: defer DEBUG_PRINT((pdev, 13, "%s: done\n", __FUNCTION__)); } -#ifndef _WIN64 +#if !defined _WIN64 && !defined __MINGW32__ static _inline void RestoreFPU(PDev *pdev, UINT8 FPUSave[]) { @@ -1872,7 +1872,7 @@ static _inline Resource *GetBitmapImage(PDev *pdev, SURFOBJ *surf, XLATEOBJ *col dest_end = (UINT8 *)image_res + alloc_size; alloc_size = height * line_size; -#ifndef _WIN64 +#if !defined _WIN64 && !defined __MINGW32__ if (have_sse2 && alloc_size >= 1024) { use_sse = TRUE; SaveFPU(pdev, FPUSave); @@ -1882,7 +1882,7 @@ static _inline Resource *GetBitmapImage(PDev *pdev, SURFOBJ *surf, XLATEOBJ *col PutBytesAlign(pdev, &chunk, &dest, &dest_end, src, line_size, &pdev->Res->num_bits_pages, alloc_size, line_size, use_sse); } -#ifndef _WIN64 +#if !defined _WIN64 && !defined __MINGW32__ if (use_sse) { RestoreFPU(pdev, FPUSave); } @@ -3320,7 +3320,7 @@ void ResDestroyGlobals() image_id_sem = NULL; } -#ifndef _WIN64 +#if !defined _WIN64 && !defined __MINGW32__ void CheckAndSetSSE2() { |