diff options
| author | Norbert Lange | 2009-08-16 16:39:34 +0000 |
|---|---|---|
| committer | Norbert Lange | 2009-08-16 16:39:34 +0000 |
| commit | c96affd0c1e5480fe1a4a3d3e82583c795570d21 (patch) | |
| tree | 3f3a71bc02976024345c5c3e44534055d9c9c4cd /graphics/scaler | |
| parent | 2b147c57161cdacf3cdc5bc572ce46160cbd6b5e (diff) | |
| parent | ce30a513acdaab2ca5eacd136cc80ade1beabb3a (diff) | |
| download | scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.tar.gz scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.tar.bz2 scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.zip | |
merge with trunk
svn-id: r43443
Diffstat (limited to 'graphics/scaler')
| -rw-r--r-- | graphics/scaler/scale2x.h | 5 | ||||
| -rw-r--r-- | graphics/scaler/scale3x.h | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/graphics/scaler/scale2x.h b/graphics/scaler/scale2x.h index cefa14f22a..a6365c113e 100644 --- a/graphics/scaler/scale2x.h +++ b/graphics/scaler/scale2x.h @@ -25,6 +25,11 @@ #define __restrict__ #endif +#ifdef __sgi +#define __restrict__ __restrict +#endif + + typedef unsigned char scale2x_uint8; typedef unsigned short scale2x_uint16; typedef unsigned scale2x_uint32; diff --git a/graphics/scaler/scale3x.h b/graphics/scaler/scale3x.h index 3f24d884e1..671a207570 100644 --- a/graphics/scaler/scale3x.h +++ b/graphics/scaler/scale3x.h @@ -25,6 +25,10 @@ #define __restrict__ #endif +#ifdef __sgi +#define __restrict__ __restrict +#endif + typedef unsigned char scale3x_uint8; typedef unsigned short scale3x_uint16; typedef unsigned scale3x_uint32; |