From 3bae68a53935048e0ac72a66d9bc80d4b574a6cf Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Fri, 16 Feb 2018 07:24:05 +0100
Subject: [PATCH] Do not include 'pcre.h' and 'zlib.h'.
---
.../fficall/src/truffle_common/base_rffi.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/com.oracle.truffle.r.native/fficall/src/truffle_common/base_rffi.c b/com.oracle.truffle.r.native/fficall/src/truffle_common/base_rffi.c
index 17c0363e6c..db79b2215b 100644
--- a/com.oracle.truffle.r.native/fficall/src/truffle_common/base_rffi.c
+++ b/com.oracle.truffle.r.native/fficall/src/truffle_common/base_rffi.c
@@ -108,13 +108,9 @@ void call_base_strtol(void (*call_setresult)(long result, int cerrno), char *s,
call_setresult(rc, errno);
}
-#include <zlib.h>
-#include <bzlib.h>
-#ifdef HAVE_PCRE_PCRE_H
-# include <pcre/pcre.h>
-#else
-# include <pcre.h>
-#endif
+extern const char * pcre_version();
+extern const char * zlibVersion();
+
void call_base_eSoftVersion(void (*call_eSoftVersion_setfields)(char *zlibVersion, char *pcreVersion)) {
char sZlibVersion[256], sPcreVersion[256];
--
GitLab