From: Dave Watson <davejwatson@fb.com>
Date: Thu, 3 Apr 2014 20:40:58 +0000 (-0700)
Subject: fix automake
X-Git-Tag: v0.22.0~616
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d666fcdb4604af4b661c254d16cae8d573a06ea6;p=folly.git

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
---

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/Malloc.cpp
deleted file mode 100644
index 6a322314..00000000
--- a/folly/detail/Malloc.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright 2014 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "folly/detail/Malloc.h"
-
-extern "C" {
-
-#if !FOLLY_HAVE_WEAK_SYMBOLS
-int (*rallocm)(void**, size_t*, size_t, size_t, int) = nullptr;
-int (*allocm)(void**, size_t*, size_t, int) = nullptr;
-int (*mallctl)(const char*, void*, size_t*, void*, size_t) = nullptr;
-#endif
-
-}
diff --git a/folly/detail/MallocImpl.cpp b/folly/detail/MallocImpl.cpp
new file mode 100644
index 00000000..6a322314
--- /dev/null
+++ b/folly/detail/MallocImpl.cpp
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2014 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "folly/detail/Malloc.h"
+
+extern "C" {
+
+#if !FOLLY_HAVE_WEAK_SYMBOLS
+int (*rallocm)(void**, size_t*, size_t, size_t, int) = nullptr;
+int (*allocm)(void**, size_t*, size_t, int) = nullptr;
+int (*mallctl)(const char*, void*, size_t*, void*, size_t) = nullptr;
+#endif
+
+}