Log profiler: BSD/win32 portability fixes.

diff --git a/mono/profiler/proflog.c b/mono/profiler/proflog.c
index f1ec3ba59f397297be43db2ca548da0ee0d7b64c..865c098b93b2e39fe01276cb6ad37e9184f06353 100644 (file)
--- a/mono/profiler/proflog.c
+++ b/mono/profiler/proflog.c
@@ -27,7 +27,9 @@
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #endif
+#ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
+#endif
 #ifdef HAVE_EXECINFO_H
 #include <execinfo.h>
 #endif
@@ -1130,8 +1132,9 @@ thread_name (MonoProfiler *prof, uintptr_t tid, const char *name)
        EXIT_LOG (logbuffer);
 }
 
+#ifndef HOST_WIN32
 #include "mono/io-layer/atomic.h"
-//#ifdef HOST_WIN32
+#endif
 #define cmp_exchange InterlockedCompareExchangePointer
 /*#else
 static void*
@@ -1285,6 +1288,18 @@ dump_usym (const char *name, uintptr_t value, uintptr_t size)
 }
 
 #ifdef ELFMAG0
+
+#if SIZEOF_VOID_P == 4
+#define ELF_WSIZE 32
+#else
+#define ELF_WSIZE 64
+#endif
+#ifndef ElfW
+#define ElfW(type)      _ElfW (Elf, ELF_WSIZE, type)
+#define _ElfW(e,w,t)    _ElfW_1 (e, w, _##t)
+#define _ElfW_1(e,w,t)  e##w##t
+#endif
+
 static void
 dump_elf_symbols (ElfW(Sym) *symbols, int num_symbols, const char *strtab, void *load_addr)
 {