diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-23 13:30:45 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-23 13:30:45 (GMT) |
| commit | 7e63083ea10c94a9a905807f6f457820303f787f (patch) | |
| tree | 0db35f66b0aaef9cca59a04278f416a90673bebc /unix | |
| parent | 92eff9a92206e2292cbd5dbc8e2320ce874ea7fb (diff) | |
| parent | 5c8ce61f7963bdd41e0d7c9d18a7b4e5f918eb35 (diff) | |
| download | tcl-7e63083ea10c94a9a905807f6f457820303f787f.zip tcl-7e63083ea10c94a9a905807f6f457820303f787f.tar.gz tcl-7e63083ea10c94a9a905807f6f457820303f787f.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 1 | ||||
| -rw-r--r-- | unix/tclUnixFile.c | 4 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index c950719..54fcf64 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1523,7 +1523,6 @@ tclZipfs.o: $(GENERIC_DIR)/tclZipfs.c $(CC) -c $(CC_SWITCHES) \ -DCFG_RUNTIME_DLLFILE="\"$(TCL_LIB_FILE)\"" \ -DCFG_RUNTIME_LIBDIR="\"$(libdir)\"" \ - -DCFG_RUNTIME_BINDIR="\"$(bindir)\"" \ -I$(ZLIB_DIR) -I$(ZLIB_DIR)/contrib/minizip \ $(GENERIC_DIR)/tclZipfs.c diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index 3c8a318..05876a8 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -44,8 +44,8 @@ TclpFindExecutable( wchar_t buf[PATH_MAX]; char name[PATH_MAX * 3 + 1]; - GetModuleFileNameW(NULL, buf, PATH_MAX); - cygwin_conv_path(3, buf, name, PATH_MAX); + GetModuleFileNameW(NULL, buf, sizeof(buf)/sizeof(wchar_t)); + cygwin_conv_path(3, buf, name, sizeof(name)); length = strlen(name); if ((length > 4) && !strcasecmp(name + length - 4, ".exe")) { /* Strip '.exe' part. */ diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index cefe603..4027f1f 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -92,6 +92,8 @@ extern "C" { /* Make some symbols available without including <windows.h> */ # define CP_UTF8 65001 # define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 0x00000004 +# define HMODULE void * +# define MAX_PATH 260 # define SOCKET unsigned int # define WSAEWOULDBLOCK 10035 typedef unsigned short WCHAR; |