From 4a9e9edab80121be9579aec24624e8591be51ede Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Mon, 16 Dec 2013 21:58:32 +0400
Subject: [PATCH] A few attempts to fix failing travis.
---
src/lib/small/slab_arena.c | 4 ++++
src/plugin/mysql/mysql.cc | 4 ++--
src/plugin/pg/pg.cc | 4 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/lib/small/slab_arena.c b/src/lib/small/slab_arena.c
index 5df79839e7..72ee273f8b 100644
--- a/src/lib/small/slab_arena.c
+++ b/src/lib/small/slab_arena.c
@@ -35,6 +35,10 @@
#include <assert.h>
#include <limits.h>
+#if defined(__FreeBSD__)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
+
void
munmap_checked(void *addr, size_t size)
{
diff --git a/src/plugin/mysql/mysql.cc b/src/plugin/mysql/mysql.cc
index 35eaa7ac08..9039de04c1 100644
--- a/src/plugin/mysql/mysql.cc
+++ b/src/plugin/mysql/mysql.cc
@@ -44,7 +44,7 @@ extern "C" {
#include <errno.h>
#include <string.h>
#include <coeio.h>
-#include <tarantool_ev.h>
+#include "third_party/tarantool_ev.h"
#include <lua/utils.h>
@@ -52,7 +52,7 @@ extern "C" {
#include <mysql.h>
#include <scoped_guard.h>
-#include <tarantool/plugin.h>
+#include <plugin.h>
/**
diff --git a/src/plugin/pg/pg.cc b/src/plugin/pg/pg.cc
index c5ba11e8ce..c653a708dd 100644
--- a/src/plugin/pg/pg.cc
+++ b/src/plugin/pg/pg.cc
@@ -43,14 +43,14 @@ extern "C" {
#include <lauxlib.h>
#include <lualib.h>
}
-#include <tarantool/plugin.h>
+#include <plugin.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <string.h>
#include <coeio.h>
-#include <tarantool_ev.h>
+#include "third_party/tarantool_ev.h"
#include <lua/utils.h>
--
GitLab