Merge branch 'master' of github.com:mailru/tarantool

core/CMakeLists.txt

@@ -71,14 +71,17 @@ add_library(core STATIC ${common_sources})
 add_dependencies(core generate_headers luajit)
 set_target_properties(core PROPERTIES COMPILE_FLAGS "${core_cflags}")
 
-set (common_libraries cfg core ev coro gopt misc objc luajit dl)
+set (common_libraries cfg core ev coro gopt misc objc luajit)
+if (TARGET_OS_LINUX)
+  set (common_libraries ${common_libraries} dl)
+endif()
 
 if (ENABLE_GCOV)
   set (common_libraries ${common_libraries} gcov)
 endif()
 
 if (ENABLE_BACKTRACE AND HAVE_BFD)
-  set (common_libraries ${common_libraries} bfd dl)
+  set (common_libraries ${common_libraries} bfd)
   if (ENABLE_STATIC)
      include (FindZLIB)
      set (common_libraries ${common_libraries} ${ZLIB_LIBRARIES} iberty)

core/replication.m

@@ -245,7 +245,7 @@ acceptor_handler(void *data __attribute__((unused)))
 		fiber_io_start(fiber->fd, EV_READ);
 		fiber_io_yield();
 		/* accept connection */
-		client_sock = accept(fiber->fd, &addr, &addrlen);
+		client_sock = accept(fiber->fd, (struct sockaddr*)&addr, &addrlen);
 		if (client_sock == -1) {
 			if (errno == EAGAIN && errno == EWOULDBLOCK) {
 				continue;