From d666fcdb4604af4b661c254d16cae8d573a06ea6 Mon Sep 17 00:00:00 2001 From: Dave Watson Date: Thu, 3 Apr 2014 13:40:58 -0700 Subject: [PATCH] fix automake Summary: Automake complains there are two Malloc.cpp rules - rename one of them. Facebook: Actually this file doesn't even build in fbconfig - is it still necessary? Test Plan: autoreconf -i on ubuntu doens't fail Reviewed By: pgriess@fb.com FB internal diff: D1257372 --- folly/Makefile.am | 2 +- folly/detail/{Malloc.cpp => MallocImpl.cpp} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename folly/detail/{Malloc.cpp => MallocImpl.cpp} (100%) diff --git a/folly/Makefile.am b/folly/Makefile.am index cb6158b8..ceccd482 100644 --- a/folly/Makefile.am +++ b/folly/Makefile.am @@ -212,7 +212,7 @@ libfolly_la_SOURCES += detail/Clock.cpp endif if !HAVE_WEAK_SYMBOLS -libfolly_la_SOURCES += detail/Malloc.cpp +libfolly_la_SOURCES += detail/MallocImpl.cpp endif if !HAVE_BITS_FUNCTEXCEPT diff --git a/folly/detail/Malloc.cpp b/folly/detail/MallocImpl.cpp similarity index 100% rename from folly/detail/Malloc.cpp rename to folly/detail/MallocImpl.cpp -- 2.34.1