summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-12-06 01:07:27 +0000
committerMike Frysinger <vapier@gentoo.org>2005-12-06 01:07:27 +0000
commit9ac20d30b1122bf9b126b9e5dcedb327f064576c (patch)
tree857cb16799e82311d4108cd174ef26b628a2434b
parent5ccce35379ae55e1a98472b35844b4e5d116c87e (diff)
only define offsetof macro if it isnt already defined
-rw-r--r--libc/sysdeps/linux/common/getdents.c3
-rw-r--r--libc/sysdeps/linux/common/getdents64.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/libc/sysdeps/linux/common/getdents.c b/libc/sysdeps/linux/common/getdents.c
index 24ce2c8ba..25b77fe39 100644
--- a/libc/sysdeps/linux/common/getdents.c
+++ b/libc/sysdeps/linux/common/getdents.c
@@ -28,8 +28,9 @@
#include <sys/types.h>
#include <sys/syscall.h>
-#undef offsetof
+#ifndef offsetof
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
struct kernel_dirent
{
diff --git a/libc/sysdeps/linux/common/getdents64.c b/libc/sysdeps/linux/common/getdents64.c
index a475c948a..d6410262d 100644
--- a/libc/sysdeps/linux/common/getdents64.c
+++ b/libc/sysdeps/linux/common/getdents64.c
@@ -31,8 +31,9 @@
#if defined __UCLIBC_HAS_LFS__ && defined __NR_getdents64
-#undef offsetof
+#ifndef offsetof
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#endif
struct kernel_dirent64
{