summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-18 15:07:18 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-18 15:07:18 (GMT)
commit62a66095ee80918300cf2d26a7cbecf8fdfab4e1 (patch)
treecf7746a63216f18ebf06a35801494a47d5e4ea1b /generic
parentf50af0e8c33d29a694f03efedfc7bf1ae18b3e16 (diff)
downloadtcl-62a66095ee80918300cf2d26a7cbecf8fdfab4e1.zip
tcl-62a66095ee80918300cf2d26a7cbecf8fdfab4e1.tar.gz
tcl-62a66095ee80918300cf2d26a7cbecf8fdfab4e1.tar.bz2
Proposed solution for Bug 3598300 on MacOSXbug_3598300
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.h3
-rw-r--r--generic/tclPort.h5
2 files changed, 2 insertions, 6 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index 33730d4..5b23694 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -327,7 +327,6 @@ typedef long LONG;
# undef TCL_WIDE_INT_IS_LONG
# undef TCL_CFG_DO64BIT
# endif /* __LP64__ */
-# undef HAVE_STRUCT_STAT64
#endif /* __APPLE__ */
/*
@@ -436,7 +435,7 @@ typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt;
struct {long tv_sec;} st_ctim;
/* Here is a 4-byte gap */
} Tcl_StatBuf;
-#elif defined(HAVE_STRUCT_STAT64)
+#elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__)
typedef struct stat64 Tcl_StatBuf;
#else
typedef struct stat Tcl_StatBuf;
diff --git a/generic/tclPort.h b/generic/tclPort.h
index 198ee76..12a60db 100644
--- a/generic/tclPort.h
+++ b/generic/tclPort.h
@@ -19,13 +19,10 @@
#endif
#if defined(_WIN32)
# include "tclWinPort.h"
-#elif !defined(MAC_OSX_TCL)
+#else
# include "tclUnixPort.h"
#endif
#include "tcl.h"
-#if defined(MAC_OSX_TCL)
-# include "tclUnixPort.h"
-#endif
#if !defined(LLONG_MIN)
# ifdef TCL_WIDE_INT_IS_LONG