projects
/
mono.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
820faae
)
[profiler] Fix BYTE_SIZE macro conflict on OS X.
author
Alex Rønne Petersen
<alexrp@xamarin.com>
Mon, 3 Oct 2016 20:02:46 +0000
(22:02 +0200)
committer
Alex Rønne Petersen
<alexrp@xamarin.com>
Mon, 3 Oct 2016 20:02:46 +0000
(22:02 +0200)
mono/profiler/mono-profiler-log.c
patch
|
blob
|
history
diff --git
a/mono/profiler/mono-profiler-log.c
b/mono/profiler/mono-profiler-log.c
index 4f54fd7a632b45437d95c6a95e8692dc68faa503..d4a4dac55d236fbbaf224b5ad77fe1d4e2cecd1c 100644
(file)
--- a/
mono/profiler/mono-profiler-log.c
+++ b/
mono/profiler/mono-profiler-log.c
@@
-59,8
+59,11
@@
/* Worst-case size in bytes of a 64-bit value encoded with LEB128. */
#define LEB128_SIZE 10
+
/* Size of a value encoded as a single byte. */
+#undef BYTE_SIZE // mach/i386/vm_param.h on OS X defines this to 8, but it isn't used for anything.
#define BYTE_SIZE 1
+
/* Size in bytes of the event prefix (ID + time). */
#define EVENT_SIZE (BYTE_SIZE + LEB128_SIZE)