You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

93 lines
3.5 KiB

13 years ago
Index: Makefile.in
--- Makefile.in.orig 2014-10-01 21:59:52.000000000 +0200
+++ Makefile.in 2014-10-03 12:34:38.374808480 +0200
@@ -1022,7 +1022,7 @@
13 years ago
### @brief libraries
################################################################################
LIBS = @LIBEV_LIBS@ @MATH_LIBS@ @OPENSSL_LIBS@ @ICU_LIBS@ @ZLIB_LIBS@ \
- @READLINE_LIBS@ $(am__append_2)
+ @READLINE_LIBS@ $(am__append_2) @LIBS@
13 years ago
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
Index: arangosh/V8Client/ImportHelper.cpp
--- arangosh/V8Client/ImportHelper.cpp.orig 2014-10-01 21:59:52.000000000 +0200
+++ arangosh/V8Client/ImportHelper.cpp 2014-10-03 13:28:20.384112505 +0200
@@ -422,7 +422,7 @@
// integer value
// conversion might fail with out-of-range error
try {
- std::stoll(s); // this will fail if the number cannot be converted
+ std::strtol(s.c_str(), NULL, 10); // this will fail if the number cannot be converted
int64_t num = StringUtils::int64(s);
_lineBuffer.appendInteger(num);
}
Index: lib/BasicsC/operating-system.h
--- lib/BasicsC/operating-system.h.orig 2014-10-01 21:59:52.000000000 +0200
+++ lib/BasicsC/operating-system.h 2014-10-03 12:34:38.384537814 +0200
@@ -261,6 +261,7 @@
/// @brief available functions
////////////////////////////////////////////////////////////////////////////////
+#define TRI_HAVE_SC_PHYS_PAGES 1
#define TRI_HAVE_GETGRGID 1
#define TRI_HAVE_GETGRNAM 1
#define TRI_HAVE_GETLINE 1
Index: lib/JsonParser/json-parser.cpp
--- lib/JsonParser/json-parser.cpp.orig 2014-10-01 21:59:52.000000000 +0200
+++ lib/JsonParser/json-parser.cpp 2014-10-03 12:34:38.384537814 +0200
@@ -38,6 +38,7 @@
#ifndef __FreeBSD__
int fileno(FILE *stream);
#endif
+#include <stdio.h>
#endif
#define YY_NO_INPUT
Index: lib/JsonParser/json-parser.ll
--- lib/JsonParser/json-parser.ll.orig 2014-10-01 21:59:52.000000000 +0200
+++ lib/JsonParser/json-parser.ll 2014-10-03 12:34:38.384537814 +0200
@@ -38,6 +38,7 @@
#ifndef __FreeBSD__
int fileno(FILE *stream);
#endif
+#include <stdio.h>
#endif
#define YY_NO_INPUT
Index: lib/Rest/InitialiseRest.cpp
--- lib/Rest/InitialiseRest.cpp.orig 2014-10-01 21:59:52.000000000 +0200
+++ lib/Rest/InitialiseRest.cpp 2014-10-03 12:34:38.384537814 +0200
@@ -37,7 +37,6 @@
#include <openssl/opensslconf.h>
#ifndef OPENSSL_THREADS
-#error missing thread support for openssl, please recomple OpenSSL with threads
#endif
#include "BasicsC/logging.h"
Index: lib/SimpleHttpClient/SimpleHttpClient.cpp
--- lib/SimpleHttpClient/SimpleHttpClient.cpp.orig 2014-10-01 21:59:52.000000000 +0200
+++ lib/SimpleHttpClient/SimpleHttpClient.cpp 2014-10-03 12:34:38.384537814 +0200
@@ -520,7 +520,7 @@
uint32_t contentLength;
try {
- contentLength = static_cast<uint32_t>(std::stol(trimmed, nullptr, 16)); // C++11
+ contentLength = static_cast<uint32_t>(strtol(trimmed.c_str(), NULL, 16)); // C++11
}
catch (...) {
setErrorMessage("found invalid content-length", true);
Index: lib/Statistics/statistics.cpp
--- lib/Statistics/statistics.cpp.orig 2014-10-01 21:59:52.000000000 +0200
+++ lib/Statistics/statistics.cpp 2014-10-03 12:34:38.384537814 +0200
@@ -371,7 +371,7 @@
#else
-static uint64_t TRI_GetPhysicalMemory () {
+static uint64_t GetPhysicalMemory () {
PROCESS_MEMORY_COUNTERS pmc;
memset(&result, 0, sizeof(result));
pmc.cb = sizeof(PROCESS_MEMORY_COUNTERS);