From 58eed3830bfbea9a05b903c94a4331597fc90dc6 Mon Sep 17 00:00:00 2001 From: Oystein Eftevaag Date: Wed, 15 Mar 2006 07:43:44 +0000 Subject: * 'make bundle' now copies the default theme files into the bundle. * Common::File will now look inside the application bundle on MacOS X for a file if it can't find it anywhere else (so it'll find default-theme.ini and .zip) * Cleaned up some #ifs. svn-id: r21308 --- graphics/scaler/hq2x.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'graphics/scaler/hq2x.cpp') diff --git a/graphics/scaler/hq2x.cpp b/graphics/scaler/hq2x.cpp index f8863c0781..567a2fcf53 100644 --- a/graphics/scaler/hq2x.cpp +++ b/graphics/scaler/hq2x.cpp @@ -28,11 +28,9 @@ extern "C" { -#ifndef _WIN32 -#ifndef MACOSX +#if !defined(_WIN32) && !defined(MACOSX) #define hq2x_16 _hq2x_16 #endif -#endif void hq2x_16(const byte *, byte *, uint32, uint32, uint32, uint32); -- cgit v1.2.3