diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-15 21:14:05 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-03-15 21:14:05 (GMT) |
| commit | 859cb34d2ddbdd2548004b0e044f759ed55e5ebe (patch) | |
| tree | 208a77acdb455c105e739d589128c3dd644af53e /win/tclWinPort.h | |
| parent | 2bdb719524ba2e7826cfdf6a82bd80c2bcdd9c75 (diff) | |
| parent | 5841a02367f05ffbefe36849606d77718a556cb2 (diff) | |
| download | tcl-859cb34d2ddbdd2548004b0e044f759ed55e5ebe.zip tcl-859cb34d2ddbdd2548004b0e044f759ed55e5ebe.tar.gz tcl-859cb34d2ddbdd2548004b0e044f759ed55e5ebe.tar.bz2 | |
[Bug 3288345] Wrong Tcl_StatBuf used on Cygwin
Diffstat (limited to 'win/tclWinPort.h')
| -rw-r--r-- | win/tclWinPort.h | 51 |
1 files changed, 8 insertions, 43 deletions
diff --git a/win/tclWinPort.h b/win/tclWinPort.h index e5dac8c..e3c5a49 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -92,21 +92,11 @@ typedef DWORD_PTR * PDWORD_PTR; #include <signal.h> #include <limits.h> -#ifdef __CYGWIN__ -# include <unistd.h> -# ifndef _vsnprintf -# define _vsnprintf vsnprintf -# endif -# ifndef _wcsicmp -# define _wcsicmp wcscasecmp -# endif -#else -# ifndef strncasecmp -# define strncasecmp strnicmp -# endif -# ifndef strcasecmp -# define strcasecmp stricmp -# endif +#ifndef strncasecmp +# define strncasecmp strnicmp +#endif +#ifndef strcasecmp +# define strcasecmp stricmp #endif /* @@ -127,25 +117,6 @@ typedef DWORD_PTR * PDWORD_PTR; #include <time.h> /* - * cygwin does not have this struct. - */ -#ifdef __CYGWIN__ - struct _stat32i64 { - dev_t st_dev; - ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - dev_t st_rdev; - __int64 st_size; - struct {long tv_sec;} st_atim; - struct {long tv_sec;} st_mtim; - struct {long tv_sec;} st_ctim; - }; -#endif - -/* * The following defines redefine the Windows Socket errors as * BSD errors so Tcl_PosixError can do the right thing. */ @@ -549,18 +520,12 @@ typedef DWORD_PTR * PDWORD_PTR; * use by tclAlloc.c. */ -#ifdef __CYGWIN__ -# define TclpSysAlloc(size, isBin) malloc((size)) -# define TclpSysFree(ptr) free((ptr)) -# define TclpSysRealloc(ptr, size) realloc((ptr), (size)) -#else -# define TclpSysAlloc(size, isBin) ((void*)HeapAlloc(GetProcessHeap(), \ +#define TclpSysAlloc(size, isBin) ((void*)HeapAlloc(GetProcessHeap(), \ (DWORD)0, (DWORD)size)) -# define TclpSysFree(ptr) (HeapFree(GetProcessHeap(), \ +#define TclpSysFree(ptr) (HeapFree(GetProcessHeap(), \ (DWORD)0, (HGLOBAL)ptr)) -# define TclpSysRealloc(ptr, size) ((void*)HeapReAlloc(GetProcessHeap(), \ +#define TclpSysRealloc(ptr, size) ((void*)HeapReAlloc(GetProcessHeap(), \ (DWORD)0, (LPVOID)ptr, (DWORD)size)) -#endif /* * The following defines map from standard socket names to our internal |