aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngelo Mantellini <angelo.mantellini@irt-systemx.fr>2018-03-19 15:04:13 +0100
committerAngelo Mantellini <angelo.mantellini@irt-systemx.fr>2018-03-19 15:04:13 +0100
commited721c097187deece705ae663c6bffb1fc107c6d (patch)
tree1890e45547232b92502d81af7340c38110532121
parent01ac1a1274269af9d9461a275cb7dcef06cce5f2 (diff)
correct ANDROID definition (from _ANDROID_ to __ANDROID__)
Change-Id: Ida869090c853ddf186755580526b82c897772a92 Signed-off-by: Angelo Mantellini <angelo.mantellini@irt-systemx.fr>
-rwxr-xr-xlibccnx-common/ccnx/common/ccnx_KeystoreUtilities.c2
-rwxr-xr-xlibccnx-portal/ccnx/api/ccnx_Portal/ccnx_PortalStack.c2
2 files changed, 2 insertions, 2 deletions
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;