2013-09-26 17:14:40 +02:00

30 lines
862 B
Plaintext

$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;