summaryrefslogtreecommitdiff
path: root/www/logtools/files/patch-clfdomainsplit.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'www/logtools/files/patch-clfdomainsplit.cpp')
-rw-r--r--www/logtools/files/patch-clfdomainsplit.cpp31
1 files changed, 6 insertions, 25 deletions
diff --git a/www/logtools/files/patch-clfdomainsplit.cpp b/www/logtools/files/patch-clfdomainsplit.cpp
index 753703f1aa4a..c813ba9c3528 100644
--- a/www/logtools/files/patch-clfdomainsplit.cpp
+++ b/www/logtools/files/patch-clfdomainsplit.cpp
@@ -1,19 +1,12 @@
---- clfdomainsplit.cpp.orig Mon Jun 9 10:56:27 2003
-+++ clfdomainsplit.cpp Mon Jun 9 10:56:47 2003
-@@ -1,19 +1,23 @@
+--- clfdomainsplit.cpp.orig 2016-12-25 15:08:38 UTC
++++ clfdomainsplit.cpp
+@@ -1,15 +1,18 @@
-#include <stdio.h>
+-
+#include <cstdio>
-
--#if (__GNUC__ >= 3)
--#include <ext/hash_map>
-+#if defined(_LIBCPP_VERSION)
-+#include <unordered_map>
- #else
--#include <hash_map>
-+#include <ext/hash_map>
- #endif
-
+#include <cstdlib>
+ #include <unordered_map>
+
#include <unistd.h>
#include <cstring>
#include <vector>
@@ -29,15 +22,3 @@
// MAX_FDS is the maximum number of files that will be directly written to
// by one process
-@@ -166,7 +170,11 @@
- size_t operator()(const string str) const { return hash<const char *>()(str.c_str()); }
- };
-
-+#if defined(_LIBCPP_VERSION)
-+typedef unordered_map<const string, FILE **, hash_string, eqstr> HASH_TYPE;
-+#else
- typedef hash_map<const string, FILE **, hash_string, eqstr> HASH_TYPE;
-+#endif
- HASH_TYPE fd_map;
-
- typedef FILE * PFILE;