From: Maxim Mamontov <faust.madf@gmail.com>
Date: Tue, 19 Jul 2016 17:42:17 +0000 (+0300)
Subject: Merge branch 'stg-2.409'
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/5ac9b6c2949b075cbb8d8c91dd9f603f3f8ad0a3?ds=sidebyside
Merge branch 'stg-2.409'
---
5ac9b6c2949b075cbb8d8c91dd9f603f3f8ad0a3
diff --cc projects/sgconv/build
index 1bc23718,1bc23718..3c2f3f91
--- a/projects/sgconv/build
+++ b/projects/sgconv/build
@@@ -72,7 -72,7 +72,6 @@@ printf " Building sgconv for $sy
printf "#############################################################################\n"
STG_LIBS="logger.lib
-- locker.lib
crypto.lib
common.lib
conffiles.lib
diff --cc projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
index f012fa1a,567c537a..f5a57a48
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@@ -83,7 -79,7 +83,6 @@@ int CONFIGPROTO::Prepare(
sigaddset(&sigmask, SIGUSR1);
sigaddset(&sigmask, SIGHUP);
pthread_sigmask(SIG_BLOCK, &sigmask, &oldmask);
--
m_listenSocket = socket(PF_INET, SOCK_STREAM, 0);
if (m_listenSocket < 0)
diff --cc stglibs/pinger.lib/Makefile
index c8c09b3e,c8c09b3e..803f7ac4
--- a/stglibs/pinger.lib/Makefile
+++ b/stglibs/pinger.lib/Makefile
@@@ -10,8 -10,8 +10,7 @@@ INCS = pinger.
LIBS = $(LIB_THREAD)
--LIB_INCS = -I ../locker.lib/include \
-- -I ../common.lib/include
++LIB_INCS = -I ../common.lib/include
include ../Makefile.in