devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 8 Actions Packages Projects 1 Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
James Booth
2016-02-28 23:18:50 +00:00
parent ab08d0a378 accde2a61c
commit da7e59bc86
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -189,7 +189,7 @@ endif
if BUILD_C_API if BUILD_C_API
lib_LTLIBRARIES = libprofanity.la 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 libprofanity_la_SOURCES = src/plugins/profapi.c
library_includedir=$(includedir) library_includedir=$(includedir)

2
src/plugins/themes.c
View File

@@ -74,7 +74,7 @@ plugin_themes_close(void)
theme_item_t theme_item_t
plugin_themes_get(const char *const group, const char *const key, const char *const def) plugin_themes_get(const char *const group, const char *const key, const char *const def)
{ {
if (group && key && def && g_key_file_has_key(themes, group, key, NULL)) { if (group && key && g_key_file_has_key(themes, group, key, NULL)) {
gchar *result = g_key_file_get_string(themes, group, key, NULL); gchar *result = g_key_file_get_string(themes, group, key, NULL);
theme_item_t ret; theme_item_t ret;

2
src/ui/mucwin.c
View File

@@ -32,6 +32,8 @@
* *
*/ */
#define _GNU_SOURCE 1
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>