Added configure check for pread/pwrite.

configure.in

@@ -818,6 +818,8 @@ AC_CHECK_FUNCS(\
 	lstat \
 	memmove \
 	mmap \
+	pread \
+	pwrite \
 	rfork \
 	select \
 	sendmsg \

include/config.h.in

@@ -121,6 +121,12 @@
 /* Define if you have the openpty function.  */
 #undef HAVE_OPENPTY
 
+/* Define if you have the pread function.  */
+#undef HAVE_PREAD
+
+/* Define if you have the pwrite function.  */
+#undef HAVE_PWRITE
+
 /* Define if you have the resizeterm function.  */
 #undef HAVE_RESIZETERM
 

include/wine/obj_storage.h

@@ -14,6 +14,7 @@ extern "C" {
  */
 typedef enum tagLOCKTYPE
 {
+#undef LOCK_WRITE
 	LOCK_WRITE = 1,
 	LOCK_EXCLUSIVE = 2,
 	LOCK_ONLYONCE = 4

include/wine/port.h

@@ -10,6 +10,7 @@
 # error You must include config.h to use this header  
 #endif  
 
+#define _GNU_SOURCE  /* for pread/pwrite */
 #include <fcntl.h>
 #include <sys/types.h>
 #include <sys/time.h>
@@ -135,6 +136,14 @@ int usleep (unsigned int useconds);
 int lstat(const char *file_name, struct stat *buf);
 #endif /* HAVE_LSTAT */
 
+#ifndef HAVE_PREAD
+ssize_t pread( int fd, void *buf, size_t count, off_t offset );
+#endif /* HAVE_PREAD */
+
+#ifndef HAVE_PWRITE
+ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset );
+#endif /* HAVE_PWRITE */
+
 #ifndef S_ISLNK
 #define S_ISLNK(mod) (0)
 #endif /* S_ISLNK */

library/port.c

@@ -379,6 +379,59 @@ int lstat(const char *file_name, struct stat *buf)
 }
 #endif /* HAVE_LSTAT */
 
+
+/***********************************************************************
+ *		pread
+ *
+ * FIXME: this is not thread-safe
+ */
+#ifndef HAVE_PREAD
+ssize_t pread( int fd, void *buf, size_t count, off_t offset )
+{
+    ssize_t ret;
+    off_t old_pos;
+
+    if ((old_pos = lseek( fd, 0, SEEK_CUR )) == -1) return -1;
+    if (lseek( fd, offset, SEEK_SET ) == -1) return -1;
+    if ((ret = read( fd, buf, count )) == -1)
+    {
+        int err = errno;  /* save errno */
+        lseek( fd, old_pos, SEEK_SET );
+        errno = err;
+        return -1;
+    }
+    if (lseek( fd, old_pos, SEEK_SET ) == -1) return -1;
+    return ret;
+}
+#endif /* HAVE_PREAD */
+
+
+/***********************************************************************
+ *		pwrite
+ *
+ * FIXME: this is not thread-safe
+ */
+#ifndef HAVE_PWRITE
+ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset )
+{
+    ssize_t ret;
+    off_t old_pos;
+
+    if ((old_pos = lseek( fd, 0, SEEK_CUR )) == -1) return -1;
+    if (lseek( fd, offset, SEEK_SET ) == -1) return -1;
+    if ((ret = write( fd, buf, count )) == -1)
+    {
+        int err = errno;  /* save errno */
+        lseek( fd, old_pos, SEEK_SET );
+        errno = err;
+        return -1;
+    }
+    if (lseek( fd, old_pos, SEEK_SET ) == -1) return -1;
+    return ret;
+}
+#endif /* HAVE_PWRITE */
+
+
 /***********************************************************************
  *		getrlimit
  */