commit 7b4781a3425d15498c12b1ae1972515f56543495
author Carl Shapiro <cshapiro@google.com> Fri Feb 12 11:07:52 2010 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 12 11:07:52 2010 -0800
tree 42d6d4b043949f5773c42228fe51c829ab23e9cf
parent e44b9960af9ff6514c15048956e31ff76a5b6476
parent 8eab1c515ef7f6bdb0252d49e6ea1c8ca7d8cfed

Merge "Do not include assert.h in places where it may shadow the definition provided by Common.h if WITH_DALVIK_ASSERTS is defined.  The include from HeapBitmap.h was notable as it redefined the Dalvik friendly assert macro with the useless libc macro across all of the GC sources." into dalvik-dev

libcore/luni/src/main/native/java_net_NetworkInterface.cpp

diff --git a/libcore/luni/src/main/native/java_net_NetworkInterface.cpp b/libcore/luni/src/main/native/java_net_NetworkInterface.cpp
index 420c045..1a72710 100644
--- a/libcore/luni/src/main/native/java_net_NetworkInterface.cpp
+++ b/libcore/luni/src/main/native/java_net_NetworkInterface.cpp
@@ -30,7 +30,7 @@
 
 #include <net/if.h> // Note: Can't appear before <sys/socket.h> on OS X.
 
-#ifdef ANDROID
+#ifdef HAVE_ANDROID_OS
 #include "ifaddrs-android.h"
 #else
 #include <ifaddrs.h>