From: Mattia Basaglia <mattia.basaglia@gmail.com>
Date: Sun, 12 Mar 2017 19:34:42 +0000 (+0000)
Subject: Fix compilation
X-Git-Tag: xonotic-v0.8.2~1^2
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=d93ae92b7fae8a1e88e64906cbf01c2bf59b6716;p=xonotic%2Fnetradiant.git

Fix compilation
---

diff --git a/libs/container/hashtable.h b/libs/container/hashtable.h
index 2c5677ce..0f174d20 100644
--- a/libs/container/hashtable.h
+++ b/libs/container/hashtable.h
@@ -25,6 +25,7 @@
 #include <cstddef>
 #include <algorithm>
 #include <functional>
+#include <memory>
 #include "debugging/debugging.h"
 
 
diff --git a/libs/splines/q_shared.h b/libs/splines/q_shared.h
index 6cad80bc..6ebfb99f 100644
--- a/libs/splines/q_shared.h
+++ b/libs/splines/q_shared.h
@@ -228,7 +228,7 @@ typedef enum {
 #define MAX_QINT            0x7fffffff
 #define MIN_QINT            ( -MAX_QINT - 1 )
 
-#ifndef max
+#if !defined(__cplusplus) && !defined(max)
 #define max( x, y ) ( ( ( x ) > ( y ) ) ? ( x ) : ( y ) )
 #define min( x, y ) ( ( ( x ) < ( y ) ) ? ( x ) : ( y ) )
 #endif