diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-02 12:27:10 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-02 12:27:10 (GMT) |
| commit | b5f118d8753139dcc5bd599f67373eca836500f8 (patch) | |
| tree | 7d2cc02f9736aec246af11d9e8d474a92c308b10 /unix/tclEpollNotfy.c | |
| parent | 876a5d67826981d371dae6608868539e99b3c916 (diff) | |
| parent | 2552ed664c5cb66c0a094adecd92db0cadb0d004 (diff) | |
| download | tcl-b5f118d8753139dcc5bd599f67373eca836500f8.zip tcl-b5f118d8753139dcc5bd599f67373eca836500f8.tar.gz tcl-b5f118d8753139dcc5bd599f67373eca836500f8.tar.bz2 | |
Merge tip-548. A few more fixes, trying to make the Travis build work (finally)
Diffstat (limited to 'unix/tclEpollNotfy.c')
| -rw-r--r-- | unix/tclEpollNotfy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/unix/tclEpollNotfy.c b/unix/tclEpollNotfy.c index c540c4e..b0bde5e 100644 --- a/unix/tclEpollNotfy.c +++ b/unix/tclEpollNotfy.c @@ -16,7 +16,9 @@ #ifndef HAVE_COREFOUNDATION /* Darwin/Mac OS X CoreFoundation notifier is * in tclMacOSXNotify.c */ #if defined(NOTIFIER_EPOLL) && TCL_THREADS -#define _GNU_SOURCE /* For pipe2(2) */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE /* For pipe2(2) */ +#endif #include <fcntl.h> #include <signal.h> #include <sys/epoll.h> @@ -772,7 +774,7 @@ Tcl_WaitForEvent( numFound = PlatformEventsWait(tsdPtr->readyEvents, tsdPtr->maxReadyEvents, timeoutPtr); for (numEvent = 0; numEvent < numFound; numEvent++) { - pedPtr = tsdPtr->readyEvents[numEvent].data.ptr; + pedPtr = (PlatformEventData*)tsdPtr->readyEvents[numEvent].data.ptr; filePtr = pedPtr->filePtr; mask = PlatformEventsTranslate(&tsdPtr->readyEvents[numEvent]); #ifdef HAVE_EVENTFD |