From 2071c2a91b5f8647d95ffc95e524657bff8089d9 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Mon, 17 Aug 2015 20:09:47 +0200
Subject: Fix BeOS build

Mainly C/C++ conflicts:
* Designated initializer are not part of C++
* C++ already defines min() and max()
* Force C99 and remove -O0 since we now use a decent compiler
---
 utils/utils.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'utils/utils.h')

diff --git a/utils/utils.h b/utils/utils.h
index 3fec34aa1..e4688ce2c 100644
--- a/utils/utils.h
+++ b/utils/utils.h
@@ -59,6 +59,7 @@ struct dirent;
 #undef max
 #endif
 
+#ifndef __cplusplus
 #ifndef min
 #define min(x,y) (((x)<(y))?(x):(y))
 #endif
@@ -66,6 +67,7 @@ struct dirent;
 #ifndef max
 #define max(x,y) (((x)>(y))?(x):(y))
 #endif
+#endif
 
 #ifndef PRIxPTR
 #define PRIxPTR "x"
-- 
cgit v1.2.3