diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-01-19 11:05:51 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-19 11:07:20 +0000 |
| commit | 0c17acbb321ced2afe2f0ff6769291549838ebaa (patch) | |
| tree | 3abb6f3ba42f3b25d4a2a91179d6978f03fc2f7f /sal/inc | |
| parent | 877663b9c262be9b5d8620f756a4cfdf97195279 (diff) | |
fix SvStream to not disagree with sal on sizeof struct stat
A temporary tweak to restore build-ability; the oslDirectory
change needs a little more thought & public exposure, but rsc
no longer crashes during compile ...
Diffstat (limited to 'sal/inc')
| -rw-r--r-- | sal/inc/osl/detail/file.h | 14 | ||||
| -rw-r--r-- | sal/inc/osl/file.hxx | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/sal/inc/osl/detail/file.h b/sal/inc/osl/detail/file.h index 19415a2623fa..108d2306b36d 100644 --- a/sal/inc/osl/detail/file.h +++ b/sal/inc/osl/detail/file.h @@ -58,17 +58,13 @@ SAL_DLLPUBLIC oslFileError SAL_CALL osl_openFilePath( oslFileHandle *pHandle, sal_uInt32 uFlags ); -/* Wrappers for stat() and lstat() with Android-specific hook - for files inside the .apk. -*/ +/* Compare directory items for being the same underlying file + * this unwinds unix hard-links and symlinks etc. + */ -SAL_DLLPUBLIC oslFileError SAL_CALL osl_statFilePath( - const char *cpFilePath, - struct stat *statb ); +SAL_DLLPUBLIC sal_Bool SAL_CALL osl_identicalDirectoryItem(oslDirectory a, oslDirectory b); -SAL_DLLPUBLIC oslFileError SAL_CALL osl_lstatFilePath( - const char *cpFilePath, - struct stat *statb ); +SAL_DLLPUBLIC oslFileError SAL_CALL osl_lstatFilePath( const char *cpFilePath, struct stat *statb ); /* Get the OS specific "handle" of an open file. */ diff --git a/sal/inc/osl/file.hxx b/sal/inc/osl/file.hxx index e64e2f0aac71..d9a1d89fe84c 100644 --- a/sal/inc/osl/file.hxx +++ b/sal/inc/osl/file.hxx @@ -1389,9 +1389,9 @@ public: class DirectoryItem: public FileBase { - oslDirectoryItem _pData; public: + oslDirectoryItem _pData; /** Constructor. */ |