summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-03-23 15:26:25 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-03-23 15:26:25 (GMT)
commitf620a59f25eb5dcfba070eeff799fc947e81da02 (patch)
tree34b85e3f87e715d54fb7d13964c94e8e828dca13 /unix
parente06a1be5516db77fa0a183f2047eb6f18952ed70 (diff)
downloadtcl-f620a59f25eb5dcfba070eeff799fc947e81da02.zip
tcl-f620a59f25eb5dcfba070eeff799fc947e81da02.tar.gz
tcl-f620a59f25eb5dcfba070eeff799fc947e81da02.tar.bz2
Revert some cygwin-related signature changes from [835f8e1e9d] (2010-02-01)
They were an attempt to make the cygwin port compile again, but since cygwin is based on unix this serves no purpose any more. Add tclWinError.c to the CYGWIN build.
Diffstat (limited to 'unix')
-rw-r--r--unix/Makefile.in4
-rwxr-xr-xunix/configure2
-rw-r--r--unix/tcl.m42
3 files changed, 6 insertions, 2 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 382a41b..c88736c 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -1441,6 +1441,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 43c2d1c..66ef3b6 100755
--- a/unix/configure
+++ b/unix/configure
@@ -6931,7 +6931,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 37c7c74..fe9b136 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -1241,7 +1241,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=""