Mercurial > dwindows
changeset 2549:736282fddac5
Android: Get dwcompat building on Android. Had to disable the filesystem functions for now.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Fri, 14 May 2021 12:13:29 +0000 |
| parents | c4d75d30430c |
| children | a8d90e2896bc |
| files | dwcompat.c dwcompat.h |
| diffstat | 2 files changed, 12 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/dwcompat.c Fri May 14 11:41:31 2021 +0000 +++ b/dwcompat.c Fri May 14 12:13:29 2021 +0000 @@ -12,7 +12,7 @@ #include "dwcompat.h" #include "dw.h" -#if defined(__UNIX__) || defined(__MAC__) || defined(__IOS__) +#if defined(__UNIX__) || defined(__MAC__) || defined(__IOS__) || defined(__ANDROID__) #if defined(__FreeBSD__) || defined(__MAC__) || defined(__IOS__) #include <sys/param.h> #include <sys/ucred.h> @@ -30,7 +30,7 @@ #include <time.h> #include <errno.h> -#if defined(__UNIX__) || defined(__MAC__) || defined(__IOS__) +#if defined(__UNIX__) || defined(__MAC__) || defined(__IOS__) || defined(__ANDROID__) void msleep(long period) { #ifdef __sun__ @@ -169,7 +169,7 @@ fclose(fp); } return 0; -#else +#elif !defined(__ANDROID__) FILE *fp = setmntent(MOUNTED, "r"); struct mntent mnt; struct statfs sfs; @@ -199,6 +199,8 @@ endmntent(fp); } return 0; +#else + return 0; #endif } @@ -275,7 +277,7 @@ fclose(fp); } return 0; -#else +#elif !defined(__ANDROID__) FILE *fp = setmntent(MOUNTED, "r"); struct mntent mnt; char buffer[1024]; @@ -305,6 +307,8 @@ endmntent(fp); } return 0; +#else + return 0; #endif } @@ -369,7 +373,7 @@ } fclose(fp); } -#else +#elif !defined(__ANDROID__) FILE *fp = setmntent(MOUNTED, "r"); struct mntent mnt; char buffer[1024];
--- a/dwcompat.h Fri May 14 11:41:31 2021 +0000 +++ b/dwcompat.h Fri May 14 12:13:29 2021 +0000 @@ -4,8 +4,9 @@ #define _DWCOMPAT_H /* This header includes and defines everything needed for a given OS/compiler */ -#if defined(__UNIX__) || defined(__MAC__) || defined(__IOS__) -#ifndef __IOS__ +#if defined(__UNIX__) || defined(__MAC__) || defined(__IOS__) || defined(__ANDROID__) +/* iOS and Android currently don't use autoconf */ +#if !defined(__IOS__) && !defined(__ANDROID__) #include "dwconfig.h" #endif