summaryrefslogtreecommitdiff
path: root/games/exult/patches/patch-ac
blob: c5f4b2188659d4ba43047e3d651adefd0eceb5db (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
$NetBSD: patch-ac,v 1.2 2011/11/25 21:53:26 joerg Exp $

--- hash_utils.h.orig	2003-08-31 17:32:24.000000000 +0000
+++ hash_utils.h
@@ -20,13 +20,14 @@
 #define _HASH_UTILS_H_
 
 #include "exult_types.h"
+#include <cstring>
 
 #ifdef DONT_HAVE_HASH_MAP
 #  include <map>
 #else
 #if HAVE_EXT_HASH_MAP
 #  include <ext/hash_map>
-#  if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0))
+#  if (defined(__GNUC__) && ((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ > 3)
 using __gnu_cxx::hash_map;
 #  else
 using std::hash_map;
@@ -44,7 +45,7 @@ using std::hash_map;
 #else
 #if HAVE_EXT_HASH_SET
 #  include <ext/hash_set>
-#  if (defined(__GNUC__) && (__GNUC__ == 3) && ( __GNUC_MINOR__ > 0))
+#  if (defined(__GNUC__) && ((__GNUC__ == 3) && ( __GNUC_MINOR__ > 0)) || __GNUC__ > 3)
 using __gnu_cxx::hash_set;
 #  else
 using std::hash_set;