diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-12 06:38:22 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-08-12 06:38:22 (GMT) |
| commit | 39db46fbe1fa4d967e7a31b5b6ba03fd36cefffa (patch) | |
| tree | e0395edc533b3a9dceabd3b3a58bc7ae0f1a0750 | |
| parent | c07c2bb91ccfa02ec939148c02317d2e2978a4c2 (diff) | |
| parent | 998409ea9b162e1f9a271add26637eb24792a2aa (diff) | |
| download | tcl-39db46fbe1fa4d967e7a31b5b6ba03fd36cefffa.zip tcl-39db46fbe1fa4d967e7a31b5b6ba03fd36cefffa.tar.gz tcl-39db46fbe1fa4d967e7a31b5b6ba03fd36cefffa.tar.bz2 | |
Merge 8.5
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | win/tclWinPort.h | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 1a991c4..fc9d618 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,3 @@ -sudo: false language: c addons: apt: @@ -10,11 +9,7 @@ addons: - gcc-mingw-w64-i686 - gcc-mingw-w64-x86-64 - gcc-multilib - homebrew: - packages: - - libtommath - update: true -matrix: +jobs: include: # Testing on Linux with various compilers - name: "Linux/GCC/Shared" diff --git a/win/tclWinPort.h b/win/tclWinPort.h index 5aa02f0..3d61a39 100644 --- a/win/tclWinPort.h +++ b/win/tclWinPort.h @@ -45,7 +45,9 @@ typedef DWORD_PTR * PDWORD_PTR; /* * Ask for the winsock function typedefs, also. */ -#define INCL_WINSOCK_API_TYPEDEFS 1 +#ifndef INCL_WINSOCK_API_TYPEDEFS +# define INCL_WINSOCK_API_TYPEDEFS 1 +#endif #include <winsock2.h> #include <ws2tcpip.h> #ifdef HAVE_WSPIAPI_H |