From 83ae0caf5c998f23ecf115ce5eb9a8433bc6aca4 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Mon, 13 Jul 2015 10:18:54 +0200 Subject: [PATCH] Fixed build errors --- src/CMakeLists.txt | 1 + src/Makefile.am | 2 +- src/server.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 096ef45..48b244e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,6 +14,7 @@ set(SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/timer.c ${CMAKE_CURRENT_SOURCE_DIR}/util.c ${CMAKE_CURRENT_SOURCE_DIR}/voicetarget.c + ${CMAKE_CURRENT_SOURCE_DIR}/memory.c ) if(SSL MATCHES "openssl") diff --git a/src/Makefile.am b/src/Makefile.am index d8f476f..b4bc3fd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,7 +27,7 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. bin_PROGRAMS=umurmurd -umurmurd_SOURCES=client.c main.c messages.c pds.c server.c log.c conf.c crypt.c timer.c messagehandler.c channel.c Mumble.pb-c.c voicetarget.c ban.c util.c +umurmurd_SOURCES=client.c main.c messages.c pds.c server.c log.c conf.c crypt.c timer.c messagehandler.c channel.c Mumble.pb-c.c voicetarget.c ban.c util.c memory.c if USE_OPENSSL umurmurd_SOURCES+=ssli_openssl.c diff --git a/src/server.c b/src/server.c index a56f7b8..72f3975 100644 --- a/src/server.c +++ b/src/server.c @@ -262,7 +262,7 @@ void Server_setupUDPSockets(struct sockaddr_storage* addresses[2], struct pollfd int val = 0; int sockets[2] = {-1, -1}; - udpsocks = Memory_safeCalloc(nofServerSocks / 2, sizeof(int)) + udpsocks = Memory_safeCalloc(nofServerSocks / 2, sizeof(int)); if (hasv4) { sockets[0] = socket(PF_INET, SOCK_DGRAM, 0); @@ -315,7 +315,7 @@ void Server_run() checkIPversions(); /* max clients + server sokets + client connecting that will be disconnected */ - pollfds = Memory_safeCalloc((getIntConf(MAX_CLIENTS) + nofServerSocks + 1) , sizeof(struct pollfd)) + pollfds = Memory_safeCalloc((getIntConf(MAX_CLIENTS) + nofServerSocks + 1) , sizeof(struct pollfd)); /* Figure out bind address and port */ struct sockaddr_storage** addresses = Server_setupAddressesAndPorts(); -- 2.30.2