diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-02-26 10:13:04 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-02-26 10:13:04 (GMT) |
| commit | 4d4bf9a051a30dad87a2b518e2641851b702dd3c (patch) | |
| tree | 1566ff74caf52d519b52c4e823f7ab28ca15b54e /win | |
| parent | 632866365dc6bc82d38d23624c3ca69966bd8aaa (diff) | |
| parent | 22438af8abfb0b3cc6f608bd906d804bae7cc4de (diff) | |
| download | tk-4d4bf9a051a30dad87a2b518e2641851b702dd3c.zip tk-4d4bf9a051a30dad87a2b518e2641851b702dd3c.tar.gz tk-4d4bf9a051a30dad87a2b518e2641851b702dd3c.tar.bz2 | |
Merge trunk
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 2 | ||||
| -rw-r--r-- | win/tcl.m4 | 2 | ||||
| -rw-r--r-- | win/tkWinDialog.c | 2 | ||||
| -rw-r--r-- | win/ttkWinXPTheme.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/win/configure b/win/configure index 79138d3..f1eec1c 100755 --- a/win/configure +++ b/win/configure @@ -4276,7 +4276,7 @@ $as_echo "using shared flags" >&6; } CFLAGS_WARNING="${CFLAGS_WARNING} -Wno-format" ;; *) - CFLAGS_WARNING="${CFLAGS_WARNING} -Wdeclaration-after-statement" + CFLAGS_WARNING="${CFLAGS_WARNING} -Wdeclaration-after-statement -Wstrict-prototypes" ;; esac @@ -694,7 +694,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ CFLAGS_WARNING="${CFLAGS_WARNING} -Wno-format" ;; *) - CFLAGS_WARNING="${CFLAGS_WARNING} -Wdeclaration-after-statement" + CFLAGS_WARNING="${CFLAGS_WARNING} -Wdeclaration-after-statement -Wstrict-prototypes" ;; esac diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index 8c80ca9..c9736d2 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -1202,7 +1202,7 @@ error_return: /* interp should already hold error */ * If new dialogs are available, COM is also initialized. *---------------------------------------------------------------------- */ -static int VistaFileDialogsAvailable() +static int VistaFileDialogsAvailable(void) { HRESULT hr; IFileDialog *fdlgPtr = NULL; diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c index c51b5be..7f20ed1 100644 --- a/win/ttkWinXPTheme.c +++ b/win/ttkWinXPTheme.c @@ -429,10 +429,10 @@ static void DestroyElementData(void *clientData) { ElementData *elementData = (ElementData *)clientData; if (elementData->info->flags & HEAP_ELEMENT) { - ckfree(elementData->info->statemap); + ckfree((char *)elementData->info->statemap); ckfree((char *)elementData->info->className); ckfree((char *)elementData->info->elementName); - ckfree(elementData->info); + ckfree((char *)elementData->info); } ckfree(clientData); } @@ -1060,7 +1060,7 @@ static const ElementInfo ElementInfoTable[] = { static int GetSysFlagFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr) { - static const char *names[] = { + static const char *const names[] = { "SM_CXBORDER", "SM_CYBORDER", "SM_CXVSCROLL", "SM_CYVSCROLL", "SM_CXHSCROLL", "SM_CYHSCROLL", "SM_CXMENUCHECK", "SM_CYMENUCHECK", "SM_CXMENUSIZE", "SM_CYMENUSIZE", "SM_CXSIZE", "SM_CYSIZE", "SM_CXSMSIZE", |