diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-23 14:01:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-02-23 14:01:41 (GMT) |
| commit | 9dd933ddbd77c005974356951f153c9f6de1236e (patch) | |
| tree | 6d3ff5026d1d5699bb36291cf8be7e15589acab1 /unix | |
| parent | 5c17bbd9794f9f2fca6b4aa33ac71ef24e4515d1 (diff) | |
| parent | 5c8ce61f7963bdd41e0d7c9d18a7b4e5f918eb35 (diff) | |
| download | tcl-9dd933ddbd77c005974356951f153c9f6de1236e.zip tcl-9dd933ddbd77c005974356951f153c9f6de1236e.tar.gz tcl-9dd933ddbd77c005974356951f153c9f6de1236e.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 3f1b728..7b32815 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -1532,7 +1532,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 203a118..1ab5d14 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 e2f1104..ece0202 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -95,6 +95,8 @@ extern "C" { # define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 0x00000004 # define HANDLE void * # define HINSTANCE void * +# define HMODULE void * +# define MAX_PATH 260 # define SOCKET unsigned int # define WSAEWOULDBLOCK 10035 typedef unsigned short WCHAR; |