More log profiler portability and warning fixes.

diff --git a/mono/profiler/proflog.c b/mono/profiler/proflog.c
index f19027e9cb5e55721b40b85c9b7c1047cdcd089e..d8c8e584359b42f5ae9f773c44b58d90ec3c1c4f 100644 (file)
--- a/mono/profiler/proflog.c
+++ b/mono/profiler/proflog.c
@@ -12,7 +12,6 @@
 #include <mono/metadata/mono-gc.h>
 #include <mono/metadata/debug-helpers.h>
 #include <stdlib.h>
-#include <inttypes.h>
 #include <string.h>
 #if defined (HAVE_ZLIB)
 #include <zlib.h>
@@ -873,7 +872,7 @@ log_shutdown (MonoProfiler *prof)
 }
 
 static MonoProfiler*
-create_profiler (char *filename)
+create_profiler (const char *filename)
 {
        MonoProfiler *prof;
        prof = calloc (1, sizeof (MonoProfiler));

diff --git a/mono/profiler/utils.c b/mono/profiler/utils.c
index 72e9670548012923e51d25f621469ee1d30c0fd6..b6e83963e58108831d97cd1db9794c88b7e984fa 100644 (file)
--- a/mono/profiler/utils.c
+++ b/mono/profiler/utils.c
@@ -13,8 +13,8 @@
  *
  * Copyright 2010 Novell, Inc (http://www.novell.com)
  */
+#include "utils.h"
 #include <stdlib.h>
-#include <inttypes.h>
 #include <time.h>
 #include <stdio.h>
 #include <string.h>
@@ -25,7 +25,6 @@
 #include <sched.h>
 #endif
 
-#include "utils.h"
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>

diff --git a/mono/profiler/utils.h b/mono/profiler/utils.h
index b59072b4e9ed0329c8213dcf071ff91dbd795d3a..c7e1c33ba3c1947978dee5a308698fcac3b5a12b 100644 (file)
--- a/mono/profiler/utils.h
+++ b/mono/profiler/utils.h
@@ -1,7 +1,8 @@
 #ifndef __MONO_MPLOG_UTILS_H__
 #define __MONO_MPLOG_UTILS_H__
 
-#include <inttypes.h>
+#include "config.h"
+#include "mono/utils/mono-publib.h"
 
 void utils_init (int fast_time);
 uint64_t current_time (void);