diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-24 13:52:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-12-24 13:52:54 (GMT) |
| commit | d326c63806c4d3002a0de11a29454eb1edddb27e (patch) | |
| tree | 6323100036af56eddce918aae8e5adbdb60657c8 | |
| parent | 3ae5ed3dfcf3397abdbec6a00fae11fccd5fcc15 (diff) | |
| parent | 51bf99fdf5def9a1842cccf4308cc8d429c1ef21 (diff) | |
| download | tcl-d326c63806c4d3002a0de11a29454eb1edddb27e.zip tcl-d326c63806c4d3002a0de11a29454eb1edddb27e.tar.gz tcl-d326c63806c4d3002a0de11a29454eb1edddb27e.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tcl.h | 4 | ||||
| -rw-r--r-- | unix/tclSelectNotfy.c | 3 | ||||
| -rw-r--r-- | unix/tclUnixInit.c | 3 | ||||
| -rw-r--r-- | unix/tclUnixPort.h | 7 |
4 files changed, 16 insertions, 1 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index b436a37..8222e28 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2003,8 +2003,10 @@ typedef void (Tcl_LimitHandlerDeleteProc) (void *clientData); * Override definitions for libtommath. */ -typedef struct mp_int mp_int; +#ifndef MP_INT_DECLARED #define MP_INT_DECLARED +typedef struct mp_int mp_int; +#endif /* *---------------------------------------------------------------------------- diff --git a/unix/tclSelectNotfy.c b/unix/tclSelectNotfy.c index f9e99aa..62d77dd 100644 --- a/unix/tclSelectNotfy.c +++ b/unix/tclSelectNotfy.c @@ -233,6 +233,9 @@ typedef struct { const void *lpszClassName; } WNDCLASSW; +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wignored-attributes" +#endif extern void __stdcall CloseHandle(void *); extern void *__stdcall CreateEventW(void *, unsigned char, unsigned char, void *); diff --git a/unix/tclUnixInit.c b/unix/tclUnixInit.c index eeb766e..2aa64bf 100644 --- a/unix/tclUnixInit.c +++ b/unix/tclUnixInit.c @@ -31,6 +31,9 @@ #endif #ifdef __CYGWIN__ +#ifdef __clang__ +#pragma clang diagnostic ignored "-Wignored-attributes" +#endif DLLIMPORT extern __stdcall unsigned char GetVersionExW(void *); DLLIMPORT extern __stdcall void *GetModuleHandleW(const void *); DLLIMPORT extern __stdcall void FreeLibrary(void *); diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h index ede87ad..adbb7aa 100644 --- a/unix/tclUnixPort.h +++ b/unix/tclUnixPort.h @@ -96,6 +96,10 @@ typedef off_t Tcl_SeekOffset; # define SOCKET unsigned int # define WSAEWOULDBLOCK 10035 typedef unsigned short WCHAR; +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wignored-attributes" +#endif __declspec(dllimport) extern __stdcall int GetModuleHandleExW(unsigned int, const void *, void *); __declspec(dllimport) extern __stdcall int GetModuleFileNameW(void *, const void *, int); __declspec(dllimport) extern __stdcall int WideCharToMultiByte(int, int, const void *, int, @@ -109,6 +113,9 @@ typedef off_t Tcl_SeekOffset; __declspec(dllimport) extern __stdcall int SetFileAttributesW(const WCHAR *, int); __declspec(dllimport) extern int cygwin_conv_path(int, const void *, void *, int); +#ifdef __clang__ +#pragma clang diagnostic pop +#endif /* On Cygwin, the environment is imported from the Cygwin DLL. */ #ifndef __x86_64__ # define environ __cygwin_environ |