Mercurial > hg > openttd

changeset 5605:031b17c79c60 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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
author bjarni <bjarni@openttd.org>
date Thu, 11 Jan 2007 13:47:55 +0000
parents 709993545238
children 1176330381e4
files src/macros.h
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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; }