merge droid

This commit is contained in:
Vitor Santos Costa
2018-06-15 13:55:31 +01:00
parent a4dd2efbe7
commit f0343fc62c
7 changed files with 67 additions and 66 deletions

View File

@@ -671,7 +671,7 @@ static Int list_directory(USES_REGS1) {
#if __ANDROID__
{
const char *dirName = buf + strlen("/assets/");
AAssetManager *mgr = GLOBAL_VFS->priv[0].mgr;
AAssetManager *mgr = GLOBAL_VFS->priv;
AAssetDir *de;
const char *dp;
@@ -680,8 +680,8 @@ static Int list_directory(USES_REGS1) {
strerror(errno));
}
while ((dp = AAssetDir_getNextFileName(de))) {
YAP_Term ti = YAP_MkAtomTerm(YAP_LookupAtom(dp));
YAP_PutInSlot(sl, YAP_MkPairTerm(ti, YAP_GetFromSlot(sl)));
YAP_Term ti = MkAtomTerm(Yap_LookupAtom(dp));
Yap_PutInHandle(sl, MkPairTerm(ti, Yap_GetFromHandle(sl)));
}
AAssetDir_close(de);
}