summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-02-09 13:51:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:36 -0500
commitefd042e9792a96cc1eefe8a120047249a00fc974 (patch)
treed330716d24062385b33ddcc8da1193cd1e105aed
parent6f99430d22650ca46cec48d4f08afd0901c398eb (diff)
downloadsamba-efd042e9792a96cc1eefe8a120047249a00fc974.tar.gz
samba-efd042e9792a96cc1eefe8a120047249a00fc974.tar.bz2
samba-efd042e9792a96cc1eefe8a120047249a00fc974.zip
r5284: this is needed on my server
+/* this #undef is needed on my SuSE 9.2 Box with glibc-devel-2.3.3-118 */ +#undef u32 as sys/epoll.h has this: typedef union epoll_data { void *ptr; int fd; uint32_t u32; uint64_t u64; } epoll_data_t; metze (This used to be commit b4928f3ea8f6530317dfa76593cf93e6acd4337a)
-rw-r--r--source4/lib/events/events.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/lib/events/events.c b/source4/lib/events/events.c
index cf165c99dc..408fe8c6f1 100644
--- a/source4/lib/events/events.c
+++ b/source4/lib/events/events.c
@@ -66,6 +66,8 @@
#endif
#if WITH_EPOLL
+/* this #undef is needed on my SuSE 9.2 Box with glibc-devel-2.3.3-118 */
+#undef u32
#include <sys/epoll.h>
#endif