---
src/CMakeLists.txt | 7 ++++---
src/lib/host_windows.c | 9 ++++++++-
src/lib/utilities.c | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f45724d..a67e822 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,6 +2,7 @@
if(WIN32)
set(VARIANT "windows")
+ set(SUPPORT_TRACING 0)
else(WIN32)
set(VARIANT "linux")
endif(WIN32)
@@ -137,9 +138,9 @@ find_package(QPID REQUIRED)
## sigar
find_library(SIGAR sigar)
if(NOT_SIGAR)
- message("SIGAR library not found.")
- set(SIGAR "")
+ message(FATAL_ERROR "SIGAR library not found.")
endif(NOT_SIGAR)
+target_link_libraries(mcommon ${SIGAR})
string(REGEX REPLACE "\\." "" QPID_VERSION ${QPID_VERSION})
@@ -172,7 +173,7 @@ endif (regen_schema)
# Add QF libraries
foreach(daemon ${DAEMONS})
- target_link_libraries(${daemon} ${QPIDCOMMON_LIBRARY} ${QPIDCLIENT_LIBRARY}
${QMF_LIBRARY} ${SIGAR})
+ target_link_libraries(${daemon} ${QPIDCOMMON_LIBRARY} ${QPIDCLIENT_LIBRARY}
${QMF_LIBRARY})
IF(QPIDTYPES_FOUND)
target_link_libraries(${daemon} ${QPIDTYPES_LIBRARY})
ENDIF(QPIDTYPES_FOUND)
diff --git a/src/lib/host_windows.c b/src/lib/host_windows.c
index 0be9f68..480710d 100644
--- a/src/lib/host_windows.c
+++ b/src/lib/host_windows.c
@@ -16,6 +16,12 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+#ifndef MSVC
+# ifndef _WIN32_WINNT
+# define _WIN32_WINNT 0x0501
+# endif
+#endif
+
#include <winsock.h>
#include <windows.h>
#include <winbase.h>
@@ -25,6 +31,7 @@
#include <unistd.h>
#include <limits.h>
#include <string.h>
+#include <reason.h>
#include "matahari/logging.h"
#include "matahari/host.h"
@@ -39,7 +46,7 @@ host_os_get_uuid(void)
const char *
host_os_get_cpu_flags(void)
{
- return "unknown";
+ return strdup("unknown");
}
static void
diff --git a/src/lib/utilities.c b/src/lib/utilities.c
index 7f2f2cb..5bfcaa5 100644
--- a/src/lib/utilities.c
+++ b/src/lib/utilities.c
@@ -17,7 +17,6 @@
*/
#define _GNU_SOURCE
-#include <link.h>
#include <stdlib.h>
#include <stdio.h>
@@ -33,6 +32,7 @@ int mh_log_level = LOG_INFO;
gboolean mh_stderr_enabled = FALSE;
#if __linux__
+# include <link.h>
# include <unistd.h>
# include <sys/wait.h>
# include <sys/utsname.h>
--
1.7.2.3