Merge branch 'master' into plugins-python

2016-02-28 19:06:13 +00:00
parent d458e930d1 accde2a61c
commit 25c9b19562
2 changed files with 3 additions and 1 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -198,7 +198,7 @@ endif

 if BUILD_C_API
 lib_LTLIBRARIES = libprofanity.la
-libprofanity_la_LDFLAGS=-avoid-version -shared
+libprofanity_la_LDFLAGS=-avoid-version -shared -no-undefined
 libprofanity_la_SOURCES = src/plugins/profapi.c

 library_includedir=$(includedir)
--- a/src/ui/mucwin.c
+++ b/src/ui/mucwin.c
@@ -32,6 +32,8 @@
 *
 */

+#define _GNU_SOURCE 1
+
 #include <string.h>
 #include <assert.h>
 #include <stdlib.h>