diff options
| author | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2014-09-01 22:26:18 +0000 |
|---|---|---|
| committer | sewardj <sewardj@a5019735-40e9-0310-863c-91ae7b9d1cf9> | 2014-09-01 22:26:18 +0000 |
| commit | b69cd964e10e03cf8997f3828b08b3e9c466b78b (patch) | |
| tree | 8cacf60e89bf49792876f0630f618b548b0132b5 | |
| parent | e46752164bb5b2a24ed25cd11527930d708a4f23 (diff) | |
| download | valgrind-b69cd964e10e03cf8997f3828b08b3e9c466b78b.tar.gz | |
VG_(getdents64) is only needed on Linux, and causes build problems
on Darwin, so make it exist only on Linux.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14421 a5019735-40e9-0310-863c-91ae7b9d1cf9
| -rw-r--r-- | coregrind/m_libcfile.c | 8 | ||||
| -rw-r--r-- | include/pub_tool_libcfile.h | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/coregrind/m_libcfile.c b/coregrind/m_libcfile.c index a019dd845..be3240b22 100644 --- a/coregrind/m_libcfile.c +++ b/coregrind/m_libcfile.c @@ -522,19 +522,15 @@ Int VG_(readlink) (const HChar* path, HChar* buf, UInt bufsiz) return sr_isError(res) ? -1 : sr_Res(res); } +#if defined(VGO_linux) Int VG_(getdents64) (Int fd, struct vki_dirent64 *dirp, UInt count) { -# if defined(VGO_linux) SysRes res; /* res = getdents( fd, dirp, count ); */ res = VG_(do_syscall3)(__NR_getdents64, fd, (UWord)dirp, count); return sr_isError(res) ? -1 : sr_Res(res); -# elif defined(VGO_darwin) - I_die_here; -# else -# error "Unknown OS" -# endif } +#endif /* Check accessibility of a file. Returns zero for access granted, nonzero otherwise. */ diff --git a/include/pub_tool_libcfile.h b/include/pub_tool_libcfile.h index e93e6655a..ea50289b2 100644 --- a/include/pub_tool_libcfile.h +++ b/include/pub_tool_libcfile.h @@ -92,7 +92,10 @@ extern Int VG_(unlink) ( const HChar* file_name ); extern SysRes VG_(poll) (struct vki_pollfd *fds, Int nfds, Int timeout); extern Int VG_(readlink)( const HChar* path, HChar* buf, UInt bufsize ); + +#if defined(VGO_linux) extern Int VG_(getdents64)( Int fd, struct vki_dirent64 *dirp, UInt count ); +#endif extern const HChar* VG_(basename)( const HChar* path ); extern const HChar* VG_(dirname) ( const HChar* path ); |