more kludgeing to get pread/pwrite working

--HG--
branch : HEAD

diff --git a/src/lib/compat.c b/src/lib/compat.c
index d75249b73bfce85b2a3503317d5499787b309141..cc13be1662991d986e7eff6fe2fc9c9d82547213 100644 (file)
--- a/src/lib/compat.c
+++ b/src/lib/compat.c
@@ -1,11 +1,15 @@
 /* Copyright (c) 2002-2003 Timo Sirainen */
 
-#include "lib.h"
+#include "config.h"
+#undef HAVE_CONFIG_H
 
 #ifdef PREAD_WRAPPERS
 #  define _XOPEN_SOURCE 500 /* Linux */
 #endif
 
+#define IN_COMPAT_C
+#include "lib.h"
+
 #include <stdio.h>
 #include <ctype.h>
 #include <unistd.h>
@@ -135,6 +139,7 @@ ssize_t my_pwrite(int fd, const void *buf, size_t count, off_t offset)
 #endif
 
 #ifdef PREAD_WRAPPERS
+
 ssize_t my_pread(int fd, void *buf, size_t count, off_t offset)
 {
        return pread(fd, buf, count, offset);

diff --git a/src/lib/compat.h b/src/lib/compat.h
index ab6578bf709129fe25e79c927dfe3d783c0a0d60..ca56a07d5acc7e3d2e0a1b9d05ba371f06d38f0d 100644 (file)
--- a/src/lib/compat.h
+++ b/src/lib/compat.h
@@ -95,8 +95,10 @@ ssize_t my_writev(int fd, const struct iovec *iov, int iov_len);
 #endif
 
 #if !defined (HAVE_PREAD) || defined (PREAD_WRAPPERS)
-#  define pread my_pread
-#  define pwrite my_pwrite
+#  ifndef IN_COMPAT_C
+#    define pread my_pread
+#    define pwrite my_pwrite
+#  endif
 ssize_t my_pread(int fd, void *buf, size_t count, off_t offset);
 ssize_t my_pwrite(int fd, const void *buf, size_t count, off_t offset);
 #endif