commit a35ae1bcaa6a902aa0c434e00948bce4a9ce5113
author Christopher Ferris <cferris@google.com> Sat Jul 12 02:06:29 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Jul 12 02:06:29 2014 +0000
tree bb8b442f19130a934f8749843c5a7f221ad2be08
parent 4c28373da6e90d3f4cfd70c2ade6a9181bbbde39
parent 4306b0f82b236acb10e1f42e7d850e4edd37fb78

am 4306b0f8: am 25fba981: Merge "Do not include libc_common in malloc debug code."

* commit '4306b0f82b236acb10e1f42e7d850e4edd37fb78':

libc/Android.mk

diff --git a/libc/Android.mk b/libc/Android.mk
index cfebd9c..b0a9fb1 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -107,7 +107,7 @@
     bionic/clearenv.cpp \
     bionic/clock.cpp \
     bionic/clone.cpp \
-    bionic/cmsg_nxthdr.cpp \
+    bionic/__cmsg_nxthdr.cpp \
     bionic/connect.cpp \
     bionic/__cxa_guard.cpp \
     bionic/__cxa_pure_virtual.cpp \

libc/bionic/__cmsg_nxthdr.cpp

diff --git a/libc/bionic/cmsg_nxthdr.cpp b/libc/bionic/__cmsg_nxthdr.cpp
similarity index 95%
rename from libc/bionic/cmsg_nxthdr.cpp
rename to libc/bionic/__cmsg_nxthdr.cpp
index 8a2b33e..f962788 100644
--- a/libc/bionic/cmsg_nxthdr.cpp
+++ b/libc/bionic/__cmsg_nxthdr.cpp
@@ -37,6 +37,3 @@
   }
   return ptr;
 }
-
-// TODO: remove after NDK refresh.
-__weak_alias(cmsg_nxthdr, __cmsg_nxthdr);