If we don't have function foo, do it always as #define foo my_foo and create

your own my_foo. Did this to pread/pwrite/madvise.

--HG--
branch : HEAD

diff --git a/src/lib/compat.c b/src/lib/compat.c
index 1b3acb711dae23be466929e49487b5df625e1a29..e42e009190dbc80beb55163af18972b8ed4baf34 100644 (file)
--- a/src/lib/compat.c
+++ b/src/lib/compat.c
@@ -97,14 +97,14 @@ ssize_t my_writev(int fd, const struct iovec *iov, int iov_len)
 #endif
 
 #ifndef HAVE_PWRITE
-ssize_t pread(int fd, void *buf, size_t count, off_t offset)
+ssize_t my_pread(int fd, void *buf, size_t count, off_t offset)
 {
        if (lseek(fd, offset, SEEK_SET) < 0)
                return -1;
        return read(fd, buf, count);
 }
 
-ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset)
+ssize_t my_pwrite(int fd, const void *buf, size_t count, off_t offset)
 {
        if (lseek(fd, offset, SEEK_SET) < 0)
                return -1;

diff --git a/src/lib/compat.h b/src/lib/compat.h
index 7d5800df988d00eb1f2245ac172cc37ace355f97..809eac94db6fb1b1dc01b3ce2b64365dcb0d35b2 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
 
 #ifndef HAVE_PWRITE
-ssize_t pread(int fd, void *buf, size_t count, off_t offset);
-ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset);
+#  define pread my_pread
+#  define pwrite my_pwrite
+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
 
 /* ctype.h isn't safe with signed chars,

diff --git a/src/lib/mmap-util.c b/src/lib/mmap-util.c
index 620622dc16d9c15dffd52bd8094dca0a02bacccf..9a638d54edad247206d93859983323788659e614 100644 (file)
--- a/src/lib/mmap-util.c
+++ b/src/lib/mmap-util.c
@@ -38,8 +38,8 @@ void *mmap_rw_file(int fd, size_t *length)
 }
 
 #ifndef HAVE_MADVISE
-int madvise(void *start __attr_unused__, size_t length __attr_unused__,
-           int advice __attr_unused__)
+int my_madvise(void *start __attr_unused__, size_t length __attr_unused__,
+              int advice __attr_unused__)
 {
 }
 #endif

diff --git a/src/lib/mmap-util.h b/src/lib/mmap-util.h
index e98ae41d080dc0c87892f6e60e57527eb1723476..22a88034cb7068555443a1651160f543fcff7d57 100644 (file)
--- a/src/lib/mmap-util.h
+++ b/src/lib/mmap-util.h
@@ -15,7 +15,8 @@
 #endif
 
 #ifndef HAVE_MADVISE
-int madvise(void *start, size_t length, int advice);
+#  define madvise my_madvise
+int my_madvise(void *start, size_t length, int advice);
 #  ifndef MADV_NORMAL
 #    define MADV_NORMAL 0
 #    define MADV_RANDOM 0