From da15279fa3ce8a965f6d77e4483811ce94a8f9ea Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Wed, 17 Oct 2018 00:58:39 +0200 Subject: [PATCH 1/2] fix flood test libs --- tests/irc/flood/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/irc/flood/Makefile.am b/tests/irc/flood/Makefile.am index 85b52eab..58c0d98d 100644 --- a/tests/irc/flood/Makefile.am +++ b/tests/irc/flood/Makefile.am @@ -33,8 +33,7 @@ test_796_LDADD = \ ../../../src/fe-common/core/libfe_common_core.a \ ../../../src/core/libcore.a \ ../../../src/lib-config/libirssi_config.a \ - @GLIB_LIBS@ \ - @OPENSSL_LIBS@ + @PROG_LIBS@ test_796_SOURCES = \ test-796.c From cbc27062e7f7d501623ee52614bc8012f1d5a97a Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Wed, 17 Oct 2018 00:58:49 +0200 Subject: [PATCH 2/2] fix duplicate include guard --- src/fe-common/core/fe-settings.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fe-common/core/fe-settings.h b/src/fe-common/core/fe-settings.h index dd33f223..cc628790 100644 --- a/src/fe-common/core/fe-settings.h +++ b/src/fe-common/core/fe-settings.h @@ -1,5 +1,5 @@ -#ifndef __FE_CHANNELS_H -#define __FE_CHANNELS_H +#ifndef __FE_SETTINGS_H +#define __FE_SETTINGS_H void fe_settings_set_print(const char *key);