This commit merges in changes from branches/ASPACEM (specifically,

changes from r4341 through r4787 inclusive).  That branch is now dead.
Please do not commit anything else to it.

For the most part the merge was not troublesome.  The main areas of
uncertainty are:

- build system: I had to import by hand Makefile.core-AM_CPPFLAGS.am
  and include it in a couple of places.  Building etc seems to still
  work, but I haven't tried building the documentation.

- syscall wrappers: Following analysis by Greg & Nick, a whole lot of
  stuff was moved from -generic to -linux after the branch was created.
  I think that is satisfactorily glued back together now.

- Regtests: although this appears to work, no .out files appear, which
  is strange, and makes it hard to diagnose regtest failures.  In
  particular memcheck/tests/x86/scalar.stderr.exp remains in a 
  conflicted state.

- amd64 is broken (slightly), and ppc32 will be unbuildable.  I'll
  attend to the former shortly.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4789 a5019735-40e9-0310-863c-91ae7b9d1cf9

1 files changed, 5 insertions, 5 deletions

diff --git a/include/pub_tool_libcfile.h b/include/pub_tool_libcfile.h
index 2d89c5dc9..41da4a37e 100644
--- a/include/pub_tool_libcfile.h
+++ b/include/pub_tool_libcfile.h
@@ -40,19 +40,19 @@ extern void   VG_(close)  ( Int fd );
 extern Int    VG_(read)   ( Int fd, void* buf, Int count);
 extern Int    VG_(write)  ( Int fd, const void* buf, Int count);
 extern Int    VG_(pipe)   ( Int fd[2] );
-extern OffT   VG_(lseek)  ( Int fd, OffT offset, Int whence);
+extern OffT   VG_(lseek)  ( Int fd, OffT offset, Int whence );
 
 extern SysRes VG_(stat)   ( Char* file_name, struct vki_stat* buf );
 extern Int    VG_(fstat)  ( Int   fd,        struct vki_stat* buf );
-extern Int    VG_(dup2)   ( Int oldfd, Int newfd );
+extern SysRes VG_(dup)    ( Int oldfd );
 extern Int    VG_(rename) ( Char* old_name, Char* new_name );
 extern Int    VG_(unlink) ( Char* file_name );
 
 // Returns False on failure (eg. if the buffer isn't big enough).
-extern Bool VG_(getcwd) ( Char* buf, SizeT size );
+extern Bool   VG_(getcwd) ( Char* buf, SizeT size );
 
-extern Int  VG_(readlink)( Char* path, Char* buf, UInt bufsize );
-extern Int  VG_(getdents)( UInt fd, struct vki_dirent *dirp, UInt count );
+extern Int    VG_(readlink)( Char* path, Char* buf, UInt bufsize );
+extern Int    VG_(getdents)( UInt fd, struct vki_dirent *dirp, UInt count );
 
 #endif   // __PUB_TOOL_LIBCFILE_H