Module: xenomai-2.6
Branch: master
Commit: 3a59ec791cc756177560bb1d804cadf276feeea5
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=3a59ec791cc756177560bb1d804cadf276feeea5
Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date: Thu May 10 01:18:18 2012 +0200
posix: fix build with LFS flags on 64 bits platform
---
include/posix/sys/mman.h | 2 --
include/posix/unistd.h | 2 --
src/skins/posix/shm.c | 4 +---
src/skins/posix/wrappers.c | 2 --
4 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/include/posix/sys/mman.h b/include/posix/sys/mman.h
index a304755..a542759 100644
--- a/include/posix/sys/mman.h
+++ b/include/posix/sys/mman.h
@@ -70,7 +70,6 @@ void *__real_mmap(void *addr,
int fildes,
long off);
-#if __WORDSIZE == 32
#if defined(_LARGEFILE64_SOURCE) \
|| defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
void *__real_mmap64(void *addr,
@@ -84,7 +83,6 @@ void *__real_mmap64(void *addr,
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
#define __real_mmap __real_mmap64
#endif
-#endif
int __real_munmap(void *addr, size_t len);
diff --git a/include/posix/unistd.h b/include/posix/unistd.h
index 90cce86..4eb3ec4 100644
--- a/include/posix/unistd.h
+++ b/include/posix/unistd.h
@@ -56,7 +56,6 @@ extern "C" {
int __real_ftruncate(int fildes, long length);
-#if __WORDSIZE == 32
#if defined(_LARGEFILE64_SOURCE) \
|| defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
int __real_ftruncate64(int fildes, long long length);
@@ -65,7 +64,6 @@ int __real_ftruncate64(int fildes, long long length);
#if defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64
#define __real_ftruncate __real_ftruncate64
#endif
-#endif
ssize_t __real_read(int fd, void *buf, size_t nbyte);
diff --git a/src/skins/posix/shm.c b/src/skins/posix/shm.c
index e97ab88..964c101 100644
--- a/src/skins/posix/shm.c
+++ b/src/skins/posix/shm.c
@@ -136,8 +136,7 @@ void *__wrap_mmap(void *addr,
return MAP_FAILED;
}
-/* 32 bits platform */
-#if __WORDSIZE == 32
+/* LFS support */
int __wrap_ftruncate64(int fildes, long long length)
{
int err;
@@ -214,7 +213,6 @@ void *__wrap_mmap64(void *addr,
errno = err;
return MAP_FAILED;
}
-#endif
int __shm_close(int fd)
{
diff --git a/src/skins/posix/wrappers.c b/src/skins/posix/wrappers.c
index 8d3fd7e..ee49620 100644
--- a/src/skins/posix/wrappers.c
+++ b/src/skins/posix/wrappers.c
@@ -280,7 +280,6 @@ void *__real_mmap(void *addr,
}
/* 32 bits platform */
-#if __WORDSIZE == 32
#ifdef HAVE_FTRUNCATE64
__attribute__ ((weak))
int __real_ftruncate64(int fildes, long long length)
@@ -297,7 +296,6 @@ void *__real_mmap64(void *addr,
return mmap64(addr, len, prot, flags, fd, off);
}
#endif /* HAVE_MMAP64 */
-#endif /* 32 bits */
__attribute__ ((weak))
int __real_munmap(void *addr, size_t len)
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
