Git-Mirrors/hardened_malloc
1
0
Fork 0
mirror of https://github.com/GrapheneOS/hardened_malloc.git synced 2024-06-26 06:32:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

disambiguate malloc.h

Browse Source
This commit is contained in:
Daniel Micay 2018-12-05 02:21:28 -05:00
parent f90fb3199d
commit 79cf5cbeb4
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -31,7 +31,7 @@ CXXFLAGS := -std=c++14 $(SHARED_FLAGS)
LDFLAGS := -Wl,--as-needed,-z,defs,-z,relro,-z,now,-z,nodlopen,-z,text
TIDY_CHECKS := -checks=bugprone-*,-bugprone-macro-parentheses,cert-*,clang-analyzer-*,readability-*,-readability-inconsistent-declaration-parameter-name,-readability-named-parameter
SOURCES := chacha.c malloc.c memory.c pages.c random.c util.c
SOURCES := chacha.c h_malloc.c memory.c pages.c random.c util.c
OBJECTS := $(SOURCES:.c=.o)
ifeq ($(CONFIG_CXX_ALLOCATOR),true)
@ -83,9 +83,9 @@ libhardened_malloc.so: $(OBJECTS)
$(CC) $(CFLAGS) $(LDFLAGS) -shared $^ $(LDLIBS) -o $@
chacha.o: chacha.c chacha.h util.h
malloc.o: malloc.c malloc.h mutex.h memory.h pages.h random.h util.h
h_malloc.o: h_malloc.c h_malloc.h mutex.h memory.h pages.h random.h util.h
memory.o: memory.c memory.h util.h
new.o: new.cc malloc.h util.h
new.o: new.cc h_malloc.h util.h
pages.o: pages.c pages.h memory.h util.h
random.o: random.c random.h chacha.h util.h
util.o: util.c util.h

2
malloc.c → h_malloc.c
View File

@ -11,7 +11,7 @@
#include "third_party/libdivide.h"
#include "malloc.h"
#include "h_malloc.h"
#include "mutex.h"
#include "memory.h"
#include "pages.h"

0
malloc.h → h_malloc.h
View File

2
new.cc
View File

@ -4,7 +4,7 @@
#define noreturn
extern "C" {
#include "malloc.h"
#include "h_malloc.h"
#include "util.h"
}