From 79cf5cbeb428b94016734adf51d4a0ac5a4d554b Mon Sep 17 00:00:00 2001 From: Daniel Micay Date: Wed, 5 Dec 2018 02:21:28 -0500 Subject: [PATCH] disambiguate malloc.h --- Makefile | 6 +++--- malloc.c => h_malloc.c | 2 +- malloc.h => h_malloc.h | 0 new.cc | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) rename malloc.c => h_malloc.c (99%) rename malloc.h => h_malloc.h (100%) diff --git a/Makefile b/Makefile index 127b162..99a24d1 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/malloc.c b/h_malloc.c similarity index 99% rename from malloc.c rename to h_malloc.c index 074d63f..2e3f1ff 100644 --- a/malloc.c +++ b/h_malloc.c @@ -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" diff --git a/malloc.h b/h_malloc.h similarity index 100% rename from malloc.h rename to h_malloc.h diff --git a/new.cc b/new.cc index 3798355..58ae447 100644 --- a/new.cc +++ b/new.cc @@ -4,7 +4,7 @@ #define noreturn extern "C" { -#include "malloc.h" +#include "h_malloc.h" #include "util.h" }