projects
/
folly.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
448f127
)
malloc.h doesn't exist on OSX
author
Bert Maher
<bertrand@fb.com>
Wed, 6 Apr 2016 18:31:41 +0000
(11:31 -0700)
committer
Facebook Github Bot 8
<facebook-github-bot-8-bot@fb.com>
Wed, 6 Apr 2016 18:35:32 +0000
(11:35 -0700)
Summary: Use malloc/malloc.h there instead
Reviewed By: Orvid
Differential Revision:
D3143768
fb-gh-sync-id:
3258b68df49cf7fbff28a3853663d39c147aee8b
fbshipit-source-id:
3258b68df49cf7fbff28a3853663d39c147aee8b
folly/portability/Malloc.h
patch
|
blob
|
history
diff --git
a/folly/portability/Malloc.h
b/folly/portability/Malloc.h
index 69b37043b53cc98c491879000becacd784623bea..eaf658ec63d1802dd0c48355ea5a68348fe70e20 100755
(executable)
--- a/
folly/portability/Malloc.h
+++ b/
folly/portability/Malloc.h
@@
-16,7
+16,9
@@
#pragma once
+#ifndef __APPLE__
#include <malloc.h>
+#endif
#include <folly/portability/Config.h>