fixup merge

open62541 · Mar 7, 2017 · 57bc60e · 57bc60e
1 parent 5da7903
commit 57bc60e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/server/ua_server_worker.c b/src/server/ua_server_worker.c
@@ -46,8 +46,6 @@
 # endif
 #endif
 
-#define MAXTIMEOUT 50 // max timeout in millisec until the next main loop iteration
-
 void
 UA_Server_processJob(UA_Server *server, UA_Job *job) {
     UA_ASSERT_RCU_UNLOCKED();
@@ -404,7 +402,7 @@ UA_StatusCode UA_Server_run_startup(UA_Server *server) {
         UA_Discovery_multicastListenStart(server);
 # endif
     }
-#endif
+#endif //UA_ENABLE_DISCOVERY_MULTICAST
 
     return result;
 }

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -22,7 +22,7 @@ if(UA_ENABLE_VALGRIND_UNIT_TESTS)
     find_package(Valgrind REQUIRED)
 endif()
 
-set(LIBS ${CHECK_LIBRARIES} ${open62541_LIBRARIES})
+set(LIBS ${CHECK_LIBRARIES} ${open62541_LIBRARIES} open62541)
 if(NOT WIN32)
   list(APPEND LIBS pthread m)
   if(NOT APPLE)