|
|
|
|
Index: Makefile.in
|
|
|
|
|
--- Makefile.in.orig 2014-07-01 17:11:59.000000000 +0200
|
|
|
|
|
+++ Makefile.in 2014-07-05 09:58:57.382346830 +0200
|
|
|
|
|
@@ -1020,7 +1020,7 @@
|
|
|
|
|
### @brief libraries
|
|
|
|
|
################################################################################
|
|
|
|
|
LIBS = @LIBEV_LIBS@ @MATH_LIBS@ @OPENSSL_LIBS@ @ICU_LIBS@ @ZLIB_LIBS@ \
|
|
|
|
|
- @READLINE_LIBS@ $(am__append_2)
|
|
|
|
|
+ @READLINE_LIBS@ $(am__append_2) @LIBS@
|
|
|
|
|
LN_S = @LN_S@
|
|
|
|
|
LTLIBOBJS = @LTLIBOBJS@
|
|
|
|
|
MAINT = @MAINT@
|
|
|
|
|
Index: lib/BasicsC/operating-system.h
|
|
|
|
|
--- lib/BasicsC/operating-system.h.orig 2014-07-01 17:12:00.000000000 +0200
|
|
|
|
|
+++ lib/BasicsC/operating-system.h 2014-07-05 09:58:57.382346830 +0200
|
|
|
|
|
@@ -257,6 +257,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-07-01 17:12:00.000000000 +0200
|
|
|
|
|
+++ lib/JsonParser/json-parser.cpp 2014-07-05 09:58:57.382346830 +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-07-01 17:12:00.000000000 +0200
|
|
|
|
|
+++ lib/JsonParser/json-parser.ll 2014-07-05 09:58:57.382346830 +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-07-01 17:12:00.000000000 +0200
|
|
|
|
|
+++ lib/Rest/InitialiseRest.cpp 2014-07-05 09:58:57.382346830 +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-07-01 17:12:00.000000000 +0200
|
|
|
|
|
+++ lib/SimpleHttpClient/SimpleHttpClient.cpp 2014-07-05 10:10:01.972415603 +0200
|
|
|
|
|
@@ -512,7 +512,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-07-01 17:12:00.000000000 +0200
|
|
|
|
|
+++ lib/Statistics/statistics.cpp 2014-07-05 09:58:57.382346830 +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);
|
