1
0
mirror of https://github.com/profanity-im/profanity.git synced 2024-12-04 14:46:46 -05:00

Merge branch 'master' into configure

This commit is contained in:
James Booth 2016-10-02 23:40:50 +01:00
commit f5e54643df
2 changed files with 3 additions and 1 deletions

View File

@ -98,7 +98,7 @@ unittest_sources = \
src/event/client_events.c src/event/client_events.h \ src/event/client_events.c src/event/client_events.h \
src/ui/tray.h src/ui/tray.c \ src/ui/tray.h src/ui/tray.c \
tests/unittests/xmpp/stub_xmpp.c \ tests/unittests/xmpp/stub_xmpp.c \
tests/unittests/ui/stub_ui.c \ tests/unittests/ui/stub_ui.c tests/unittests/ui/stub_ui.h \
tests/unittests/log/stub_log.c \ tests/unittests/log/stub_log.c \
tests/unittests/config/stub_accounts.c \ tests/unittests/config/stub_accounts.c \
tests/unittests/tools/stub_http_upload.c \ tests/unittests/tools/stub_http_upload.c \

View File

@ -34,6 +34,8 @@
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>