summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-05-11 09:15:24 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-05-11 09:15:24 (GMT)
commitcfb0d6742498fc7499297d4a94897aaa77d18615 (patch)
treea41b611101495290bbc42c9cbc814473cafa5eeb /generic
parentb25aceb078e19499e040c7c8d80ece4b995a46b8 (diff)
parent388266030b4466f612f662f171e33a982bc5d265 (diff)
downloadtcl-cfb0d6742498fc7499297d4a94897aaa77d18615.zip
tcl-cfb0d6742498fc7499297d4a94897aaa77d18615.tar.gz
tcl-cfb0d6742498fc7499297d4a94897aaa77d18615.tar.bz2
merge 8.7
Diffstat (limited to 'generic')
-rw-r--r--generic/tclInt.decls4
-rw-r--r--generic/tclIntPlatDecls.h6
2 files changed, 2 insertions, 8 deletions
diff --git a/generic/tclInt.decls b/generic/tclInt.decls
index 08cc863..9865609 100644
--- a/generic/tclInt.decls
+++ b/generic/tclInt.decls
@@ -1110,7 +1110,7 @@ declare 8 win {
#}
# Removed in 9.0:
#declare 10 win {
-# Tcl_DirEntry *TclpReaddir(DIR *dir)
+# Tcl_DirEntry *TclpReaddir(TclDIR *dir)
#}
# Removed in 8.3.1 (for Win32s only):
#declare 10 win {
@@ -1251,7 +1251,7 @@ declare 9 unix {
# Removed in 9.0:
#declare 10 unix {
-# Tcl_DirEntry *TclpReaddir(DIR *dir)
+# Tcl_DirEntry *TclpReaddir(TclDIR *dir)
#}
# Removed in 9.0:
#declare 11 unix {
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index e4caf72..5ec0544 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -13,12 +13,6 @@
#ifndef _TCLINTPLATDECLS
#define _TCLINTPLATDECLS
-#ifdef _WIN32
-# define Tcl_DirEntry void
-# define DIR void
-# define Tcl_Dir void
-#endif
-
#undef TCL_STORAGE_CLASS
#ifdef BUILD_tcl
# define TCL_STORAGE_CLASS DLLEXPORT