summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-19 17:49:16 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-01-19 17:49:16 (GMT)
commit0218abe5f52843f501c1735ffeadef3d5e9d24bd (patch)
tree3d2fb6e945d2b988e86c8bb080749552980d10e7
parent63fe76b6b89557c393f4e3eefa37ecf11a4d64bc (diff)
parent8c190c2de231c115b66ef2dc05a8d9b8da20b930 (diff)
downloadtcl-0218abe5f52843f501c1735ffeadef3d5e9d24bd.zip
tcl-0218abe5f52843f501c1735ffeadef3d5e9d24bd.tar.gz
tcl-0218abe5f52843f501c1735ffeadef3d5e9d24bd.tar.bz2
fix Bug 3598300 on MacOSX too
-rw-r--r--generic/tcl.h2
-rw-r--r--generic/tclPort.h5
-rw-r--r--unix/tclUnixFCmd.c2
-rw-r--r--unix/tclUnixPort.h2
4 files changed, 4 insertions, 7 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index 7155453..2556a9a 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -472,7 +472,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
diff --git a/unix/tclUnixFCmd.c b/unix/tclUnixFCmd.c
index a703935..2b6f3f3 100644
--- a/unix/tclUnixFCmd.c
+++ b/unix/tclUnixFCmd.c
@@ -245,7 +245,7 @@ MODULE_SCOPE long tclMacOSXDarwinRelease;
#endif /* NO_REALPATH */
#ifdef HAVE_FTS
-#ifdef HAVE_STRUCT_STAT64
+#if defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__)
/* fts doesn't do stat64 */
# define noFtsStat 1
#elif defined(__APPLE__) && defined(__LP64__) && \
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 7eb717b..59a35ba 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -104,7 +104,7 @@ typedef off_t Tcl_SeekOffset;
extern char **__cygwin_environ;
extern int TclOSstat(const char *name, void *statBuf);
extern int TclOSlstat(const char *name, void *statBuf);
-#elif defined(HAVE_STRUCT_STAT64)
+#elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__)
# define TclOSstat stat64
# define TclOSlstat lstat64
#else