diff options
| author | bjarni <bjarni@openttd.org> | 2007-01-11 13:47:55 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2007-01-11 13:47:55 +0000 |
| commit | f348fc7b4c95115ca36c4a467c1cca7c7db56bd3 (patch) | |
| tree | e9da2ca40c6fb66b9c93882c90f22e783f731f24 | |
| parent | 8694ad9e0d020241ead33a4e0eaea22ba55bf8a2 (diff) | |
| download | openttd-f348fc7b4c95115ca36c4a467c1cca7c7db56bd3.tar.xz | |
(svn r8061) -Fix r8055: obj-c can't handle templates
We will need to figure out a nicer solution for this, but now OSX compiles again
| -rw-r--r-- | src/macros.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/macros.h b/src/macros.h index 9c73f38f3..a66220154 100644 --- a/src/macros.h +++ b/src/macros.h @@ -20,11 +20,14 @@ #undef max #endif +/* Objective C don't like templates */ +#ifdef __cplusplus template <typename T> static inline T max(T a, T b) { return a >= b ? a : b; } +#endif static inline int min(int a, int b) { if (a <= b) return a; return b; } |