From b81993f894e195d8fcef54cb0f77486d485861bd Mon Sep 17 00:00:00 2001 From: Jordi Vilalta Prat Date: Sun, 23 Mar 2008 11:24:23 +0000 Subject: Patch #1923547: enable nasm usage on OS/2 svn-id: r31226 --- graphics/scaler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'graphics/scaler.cpp') diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp index 0afe756034..f460124c62 100644 --- a/graphics/scaler.cpp +++ b/graphics/scaler.cpp @@ -38,7 +38,7 @@ extern "C" { // NOTE: if your compiler uses different mangled names, add another // condition here -#if !defined(_WIN32) && !defined(MACOSX) +#if !defined(_WIN32) && !defined(MACOSX) && !defined(__OS2__) #define RGBtoYUV _RGBtoYUV #define LUT16to32 _LUT16to32 #endif -- cgit v1.2.3