summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-22 13:17:43 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2013-11-22 13:17:43 (GMT)
commit39d3e6527b8253e9a2df9d4972003725207b705d (patch)
tree8a52ad980cb80651d9091d33c5fb39ff2ae86d42 /generic
parentcca6daf1b032534c3fa810c219cdc076941c0371 (diff)
parentf46d2546ab96bd78b76d02331df74ce035c356d4 (diff)
downloadtcl-39d3e6527b8253e9a2df9d4972003725207b705d.zip
tcl-39d3e6527b8253e9a2df9d4972003725207b705d.tar.gz
tcl-39d3e6527b8253e9a2df9d4972003725207b705d.tar.bz2
Cygwin: Fix conflicting definition with _mingw_stat64.h, if included together with <tcl.h>
Diffstat (limited to 'generic')
-rw-r--r--generic/regcustom.h4
-rw-r--r--generic/regex.h4
-rw-r--r--generic/tcl.h2
3 files changed, 9 insertions, 1 deletions
diff --git a/generic/regcustom.h b/generic/regcustom.h
index 1c970ea..d907ca7 100644
--- a/generic/regcustom.h
+++ b/generic/regcustom.h
@@ -74,7 +74,11 @@
#endif
/* Interface types */
#define __REG_WIDE_T Tcl_UniChar
+#ifdef __CYGWIN__
+#define __REG_REGOFF_T int /* Not really right, but good enough... */
+#else
#define __REG_REGOFF_T long /* Not really right, but good enough... */
+#endif
#define __REG_VOID_T void
#define __REG_CONST const
/* Names and declarations */
diff --git a/generic/regex.h b/generic/regex.h
index 9466fbb..4422f2a 100644
--- a/generic/regex.h
+++ b/generic/regex.h
@@ -106,7 +106,11 @@ extern "C" {
#endif
/* interface types */
#define __REG_WIDE_T Tcl_UniChar
+#ifdef __CYGWIN__
+#define __REG_REGOFF_T int /* not really right, but good enough... */
+#else
#define __REG_REGOFF_T long /* not really right, but good enough... */
+#endif
#define __REG_VOID_T void
#define __REG_CONST const
/* names and declarations */
diff --git a/generic/tcl.h b/generic/tcl.h
index ab54078..4bf81cc 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -458,7 +458,7 @@ typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt;
typedef struct _stat32i64 Tcl_StatBuf;
# endif /* _MSC_VER < 1400 */
#elif defined(__CYGWIN__)
- typedef struct _stat32i64 {
+ typedef struct {
dev_t st_dev;
unsigned short st_ino;
unsigned short st_mode;