diff options
author | Adam Weinberger <adamw@FreeBSD.org> | 2014-07-08 20:11:04 +0000 |
---|---|---|
committer | Adam Weinberger <adamw@FreeBSD.org> | 2014-07-08 20:11:04 +0000 |
commit | 013f4c87edd89581ad5e1fba01dd93bdcc92f58f (patch) | |
tree | 84fcc7d853ed38a63fcb22b93d9b74214181ce88 /www/logtools/files/patch-clfdomainsplit.cpp | |
parent | Update to 7.4.2, and pass maintainership to submitter. (diff) |
Stage, and fix build with clang.
PR: 191377
Submitted by: tkato432@yahoo.com
Notes
Notes:
svn path=/head/; revision=361287
Diffstat (limited to 'www/logtools/files/patch-clfdomainsplit.cpp')
-rw-r--r-- | www/logtools/files/patch-clfdomainsplit.cpp | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/www/logtools/files/patch-clfdomainsplit.cpp b/www/logtools/files/patch-clfdomainsplit.cpp new file mode 100644 index 000000000000..753703f1aa4a --- /dev/null +++ b/www/logtools/files/patch-clfdomainsplit.cpp @@ -0,0 +1,43 @@ +--- clfdomainsplit.cpp.orig Mon Jun 9 10:56:27 2003 ++++ clfdomainsplit.cpp Mon Jun 9 10:56:47 2003 +@@ -1,19 +1,23 @@ +-#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 <unistd.h> + #include <cstring> + #include <vector> +-#include <ctype.h> ++#include <cctype> ++#include <string> + #include "logtools.h" + + using namespace std; ++#if !defined(_LIBCPP_VERSION) + using namespace __gnu_cxx; ++#endif + + // 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; |