diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-07-15 02:03:58 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2011-07-15 02:04:19 +0300 |
| commit | 17627b601a93b04a5959dc21f210fe11d8352446 (patch) | |
| tree | 2d0608709d034927d120ee4f451b59bac1ea0ac9 | |
| parent | 1a798a5ebc545ca9047550db1983ea65c910293d (diff) | |
Android build fixes
| -rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 4 | ||||
| -rw-r--r-- | sal/qa/osl/file/osl_File_Const.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index e4acd654d..e38da907e 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -2180,7 +2180,7 @@ namespace osl_VolumeInfo } -#if ( defined UNX ) +#if defined(UNX) && !defined(ANDROID) void getMaxNameLength_002( ) { struct statvfs aStatFS; @@ -6055,7 +6055,7 @@ namespace osl_Directory if (tmp_x.lastIndexOf('/') != (tmp_x.getLength() - 1)) tmp_x += rtl::OString('/'); -#ifndef WNT +#if !defined(WNT) && !defined(ANDROID) // FIXME would be nice to create unique dir even on Windows tmp_x += rtl::OString("XXXXXX"); char *out = mkdtemp(const_cast<char*>(tmp_x.getStr())); diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index cd6f01cb2..88df98ef0 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -95,7 +95,9 @@ const sal_Char pBuffer_Blank[] = ""; # include <sys/param.h> # include <sys/mount.h> # endif -# include <sys/statvfs.h> +# if !defined(ANDROID) +# include <sys/statvfs.h> +# endif # include <sys/types.h> # define TEST_PLATFORM "" # define TEST_PLATFORM_ROOT "/" |