summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gmail.com>2018-05-05 13:31:43 +0100
committerGitHub <noreply@github.com>2018-05-05 13:31:43 +0100
commit737b6918703c1d0be1e3d5272f7d06211cdb2b87 (patch)
tree87973c2ed15bd11138f097a50ff34c5a79e18557
parentff709d3d65bb138b591e5a5cd3902bda9a05ecda (diff)
parent27b07469403af8bcbef9b24a42d4c44c5bffc846 (diff)
downloadlibepoxy-737b6918703c1d0be1e3d5272f7d06211cdb2b87.tar.gz
Merge pull request #172 from lantw44/master
Fix dlwrap for FreeBSD
-rw-r--r--test/dlwrap.c3
-rw-r--r--test/meson.build5
2 files changed, 6 insertions, 2 deletions
diff --git a/test/dlwrap.c b/test/dlwrap.c
index 25e17de..c0c24c2 100644
--- a/test/dlwrap.c
+++ b/test/dlwrap.c
@@ -242,7 +242,8 @@ dlwrap_real_dlsym(void *handle, const char *name)
"GLIBC_2.3",
"GLIBC_2.2.5",
"GLIBC_2.2",
- "GLIBC_2.0"
+ "GLIBC_2.0",
+ "FBSD_1.0"
};
int num_versions = sizeof(version) / sizeof(version[0]);
int i;
diff --git a/test/meson.build b/test/meson.build
index ee1a732..ea2b354 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -5,10 +5,13 @@ has_gles1 = gles1_dep.found()
has_gles2 = gles2_dep.found()
build_x11_tests = enable_x11 and x11_dep.found()
-test_cflags = common_cflags + [
+test_cflags = common_cflags
+if not has_dlvsym
+test_cflags += [
'-D_XOPEN_SOURCE',
'-D_POSIX_C_SOURCE=200809L',
]
+endif
# Unconditionally built tests
test('header_guards',