summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes2015-07-30 11:50:15 -0500
committerAndroid Git Automerger2015-07-30 11:50:15 -0500
commit145afc2cc4f973a4ad63aeabe5b0f633c8e99cec (patch)
tree43391eef0509bc8627b09a5b11326ff3c043fac1 /libnetutils
parentc6dbc85845e58464541bb0644ebd570c44841a4c (diff)
parentfb1ecbc55e7edeafb138eb2a60ca89ba9a7b1f0f (diff)
downloadplatform-system-core-145afc2cc4f973a4ad63aeabe5b0f633c8e99cec.tar.gz
platform-system-core-145afc2cc4f973a4ad63aeabe5b0f633c8e99cec.tar.xz
platform-system-core-145afc2cc4f973a4ad63aeabe5b0f633c8e99cec.zip
am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
* commit 'fb1ecbc55e7edeafb138eb2a60ca89ba9a7b1f0f': Use __ANDROID__ instead of HAVE_ANDROID_OS.
Diffstat (limited to 'libnetutils')
-rw-r--r--libnetutils/ifc_utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libnetutils/ifc_utils.c b/libnetutils/ifc_utils.c
index 7d2a5fbf2..956ed30c3 100644
--- a/libnetutils/ifc_utils.c
+++ b/libnetutils/ifc_utils.c
@@ -50,7 +50,7 @@
50#define ALOGW printf 50#define ALOGW printf
51#endif 51#endif
52 52
53#ifdef HAVE_ANDROID_OS 53#if defined(__ANDROID__)
54/* SIOCKILLADDR is an Android extension. */ 54/* SIOCKILLADDR is an Android extension. */
55#define SIOCKILLADDR 0x8939 55#define SIOCKILLADDR 0x8939
56#endif 56#endif
@@ -596,7 +596,7 @@ int ifc_disable(const char *ifname)
596 596
597int ifc_reset_connections(const char *ifname, const int reset_mask) 597int ifc_reset_connections(const char *ifname, const int reset_mask)
598{ 598{
599#ifdef HAVE_ANDROID_OS 599#if defined(__ANDROID__)
600 int result, success; 600 int result, success;
601 in_addr_t myaddr = 0; 601 in_addr_t myaddr = 0;
602 struct ifreq ifr; 602 struct ifreq ifr;