summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormmcc <>2016-03-17 17:55:33 +0000
committermmcc <>2016-03-17 17:55:33 +0000
commit2915fa70193d5bf5e6e22e036e5f141bca9f91e3 (patch)
treebeb4e90db08a37fae60592cc6fa64228ed5515d5
parente9519e7488dc9affc5903228dd04377e15aeae1e (diff)
downloadopenbsd-2915fa70193d5bf5e6e22e036e5f141bca9f91e3.tar.gz
openbsd-2915fa70193d5bf5e6e22e036e5f141bca9f91e3.tar.bz2
openbsd-2915fa70193d5bf5e6e22e036e5f141bca9f91e3.zip
properly guard to macros
ok otto@
-rw-r--r--src/lib/libc/stdlib/malloc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libc/stdlib/malloc.c b/src/lib/libc/stdlib/malloc.c
index 0fa0d39b8f..89c8bbb900 100644
--- a/src/lib/libc/stdlib/malloc.c
+++ b/src/lib/libc/stdlib/malloc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: malloc.c,v 1.184 2016/03/14 17:20:26 otto Exp $ */ 1/* $OpenBSD: malloc.c,v 1.185 2016/03/17 17:55:33 mmcc Exp $ */
2/* 2/*
3 * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net> 3 * Copyright (c) 2008, 2010, 2011 Otto Moerbeek <otto@drijf.net>
4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org> 4 * Copyright (c) 2012 Matthew Dempsky <matthew@openbsd.org>
@@ -93,13 +93,13 @@
93#define MQUERY(a, sz) mquery((a), (size_t)(sz), PROT_READ | PROT_WRITE, \ 93#define MQUERY(a, sz) mquery((a), (size_t)(sz), PROT_READ | PROT_WRITE, \
94 MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, (off_t)0) 94 MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, (off_t)0)
95 95
96#define _MALLOC_LEAVE(d) if (__isthreaded) do { \ 96#define _MALLOC_LEAVE(d) do { if (__isthreaded) { \
97 (d)->active--; \ 97 (d)->active--; \
98 _MALLOC_UNLOCK(); \ 98 _MALLOC_UNLOCK(); } \
99} while (0) 99} while (0)
100#define _MALLOC_ENTER(d) if (__isthreaded) do { \ 100#define _MALLOC_ENTER(d) do { if (__isthreaded) { \
101 _MALLOC_LOCK(); \ 101 _MALLOC_LOCK(); \
102 (d)->active++; \ 102 (d)->active++; } \
103} while (0) 103} while (0)
104 104
105struct region_info { 105struct region_info {