From: Angelo Mantellini <angelo.mantellini@irt-systemx.fr>
Date: Mon, 19 Mar 2018 14:04:13 +0000 (+0100)
Subject: correct ANDROID definition (from _ANDROID_ to __ANDROID__)
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F16%2F11216%2F1;p=cicn.git

correct ANDROID definition (from _ANDROID_ to __ANDROID__)

Change-Id: Ida869090c853ddf186755580526b82c897772a92
Signed-off-by: Angelo Mantellini <angelo.mantellini@irt-systemx.fr>
---

diff --git a/libccnx-common/ccnx/common/ccnx_KeystoreUtilities.c b/libccnx-common/ccnx/common/ccnx_KeystoreUtilities.c
index 1ae94ef6..aac2ddd0 100755
--- a/libccnx-common/ccnx/common/ccnx_KeystoreUtilities.c
+++ b/libccnx-common/ccnx/common/ccnx_KeystoreUtilities.c
@@ -186,7 +186,7 @@ ccnxKeystoreUtilities_CreateInHomeDirectory(const char *keystorePassword, int ke
     return params;
 }
 
-#ifdef _ANDROID_
+#ifdef __ANDROID__
 static char *
 getpass(const char *prompt)
 {
diff --git a/libccnx-portal/ccnx/api/ccnx_Portal/ccnx_PortalStack.c b/libccnx-portal/ccnx/api/ccnx_Portal/ccnx_PortalStack.c
index 5490c44d..82d973f0 100755
--- a/libccnx-portal/ccnx/api/ccnx_Portal/ccnx_PortalStack.c
+++ b/libccnx-portal/ccnx/api/ccnx_Portal/ccnx_PortalStack.c
@@ -154,7 +154,7 @@ ccnxPortalStack_Ignore(const CCNxPortalStack *portalStack, const CCNxName *name,
 int
 ccnxPortalStack_GetErrorCode(const CCNxPortalStack *portalStack)
 {
-#ifndef _ANDROID_
+#ifndef __ANDROID__
     extern int errno;
 #endif
     return errno;