diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-26 12:43:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-26 12:43:46 (GMT) |
| commit | 29b6cb48013e77d8ca911bdbdc7361a1a551f300 (patch) | |
| tree | 1d55a1f5c68da11ce8efb88a7138cde954c645d5 | |
| parent | 93f5ab8b03bec7f45aa57cac04a42a42381452f9 (diff) | |
| download | tcl-29b6cb48013e77d8ca911bdbdc7361a1a551f300.zip tcl-29b6cb48013e77d8ca911bdbdc7361a1a551f300.tar.gz tcl-29b6cb48013e77d8ca911bdbdc7361a1a551f300.tar.bz2 | |
Fix this Travis build problems on Win32: [https://travis-ci.org/tcltk/tcl/jobs/562935948]. Also, use _read/_write on Windows whenever possible, as read/write is deprecated there.
| -rw-r--r-- | generic/tclTest.c | 12 | ||||
| -rw-r--r-- | win/cat.c | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index 35687fd..beb0725 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -2359,11 +2359,11 @@ ExitProcOdd( ClientData clientData) /* Integer value to print. */ { char buf[16 + TCL_INTEGER_SPACE]; - size_t len; + int len; - sprintf(buf, "odd %d\n", PTR2INT(clientData)); + sprintf(buf, "odd %d\n", (int)PTR2INT(clientData)); len = strlen(buf); - if (len != (size_t) write(1, buf, len)) { + if (len != (int) write(1, buf, len)) { Tcl_Panic("ExitProcOdd: unable to write to stdout"); } } @@ -2373,11 +2373,11 @@ ExitProcEven( ClientData clientData) /* Integer value to print. */ { char buf[16 + TCL_INTEGER_SPACE]; - size_t len; + int len; - sprintf(buf, "even %d\n", PTR2INT(clientData)); + sprintf(buf, "even %d\n", (int)PTR2INT(clientData)); len = strlen(buf); - if (len != (size_t) write(1, buf, len)) { + if (len != (int) write(1, buf, len)) { Tcl_Panic("ExitProcEven: unable to write to stdout"); } } @@ -21,14 +21,14 @@ main(void) const char *err; while (1) { - n = read(0, buf, sizeof(buf)); + n = _read(0, buf, sizeof(buf)); if (n <= 0) { break; } - write(1, buf, n); + _write(1, buf, n); } err = (sizeof(int) == 2) ? "stderr16" : "stderr32"; - write(2, err, strlen(err)); + _write(2, err, (unsigned int)strlen(err)); return 0; } |
