diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-23 15:53:52 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-23 15:53:52 (GMT) |
| commit | e59a3fc9085a57bbc964aa61790417af5797794d (patch) | |
| tree | 2e156a8b477c55fb54f1ba2a6bc62c03ef274c6d /unix | |
| parent | 7bfb05f7fb4dd46306021ae1e767db1edae74593 (diff) | |
| parent | fa9a43ff5fd981089f0a432872444073f8710c99 (diff) | |
| download | tcl-e59a3fc9085a57bbc964aa61790417af5797794d.zip tcl-e59a3fc9085a57bbc964aa61790417af5797794d.tar.gz tcl-e59a3fc9085a57bbc964aa61790417af5797794d.tar.bz2 | |
Revert some cygwin-related signature changes from [835f8e1e9d] (2010-01-22).
They were an attempt to make the cygwin port compile again, but since cygwin
is based on unix this serves no purpose any more.
Use EAGAIN in stead of EWOULDBLOCK, because in VS10+ the value of EWOULDBLOCK
is no longer the same as EAGAIN
Add tclWinError.c to the CYGWIN build.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rwxr-xr-x | unix/configure | 2 | ||||
| -rw-r--r-- | unix/tcl.m4 | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 0a22a58..81185b4 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1541,6 +1541,10 @@ tclMacOSXFCmd.o: $(MAC_OSX_DIR)/tclMacOSXFCmd.c tclMacOSXNotify.o: $(MAC_OSX_DIR)/tclMacOSXNotify.c $(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tclMacOSXNotify.c +# The following is a CYGWIN only source: +tclWinError.o: $(TOP_DIR)/win/tclWinError.c + $(CC) -c $(CC_SWITCHES) $(TOP_DIR)/win/tclWinError.c + # DTrace support $(TCL_OBJS) $(STUB_LIB_OBJS) $(TCLSH_OBJS) $(TCLTEST_OBJS) $(XTTEST_OBJS): @DTRACE_HDR@ diff --git a/unix/configure b/unix/configure index 72d5d73..e737bd5 100755 --- a/unix/configure +++ b/unix/configure @@ -7057,7 +7057,7 @@ fi SHLIB_CFLAGS="" SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" - DL_OBJS="tclLoadDl.o" + DL_OBJS="tclLoadDl.o tclWinError.o" DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 39f8ca1..f6e002e 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1224,7 +1224,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ SHLIB_CFLAGS="" SHLIB_LD='${CC} -shared' SHLIB_SUFFIX=".dll" - DL_OBJS="tclLoadDl.o" + DL_OBJS="tclLoadDl.o tclWinError.o" DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" |