diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-09-06 08:02:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2018-09-06 08:02:09 (GMT) |
| commit | 00693b0bd778d46d986a05e630c0d0c0fbb63992 (patch) | |
| tree | a0692fe268ba2cb2b9f981ccf581102c4e716a8b /win | |
| parent | 5d2ce7fc6a86dd052459261a1c49569e578f7797 (diff) | |
| download | tk-00693b0bd778d46d986a05e630c0d0c0fbb63992.zip tk-00693b0bd778d46d986a05e630c0d0c0fbb63992.tar.gz tk-00693b0bd778d46d986a05e630c0d0c0fbb63992.tar.bz2 | |
Header include reform: Since "tkInt.h" already contains header files like <stdlib.h>, <string.h> and <ctype.h>, we don't have to include those in every separate C-file. Just depend on tkInt.h to provide it.
This mainly affects ttk, since most other files already adhered to this.
Diffstat (limited to 'win')
| -rw-r--r-- | win/stubs.c | 2 | ||||
| -rw-r--r-- | win/tkWinDialog.c | 4 | ||||
| -rw-r--r-- | win/tkWinPort.h | 1 | ||||
| -rw-r--r-- | win/tkWinX.c | 2 | ||||
| -rw-r--r-- | win/ttkWinXPTheme.c | 4 |
5 files changed, 7 insertions, 6 deletions
diff --git a/win/stubs.c b/win/stubs.c index 1cf23ef..c3e853e 100644 --- a/win/stubs.c +++ b/win/stubs.c @@ -1,4 +1,4 @@ -#include "tk.h" +#include "tkInt.h" /* * Undocumented Xlib internal function diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index d6d2c7d..d8eec68 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.c @@ -2227,9 +2227,9 @@ static void FreeFilterVista(DWORD count, TCLCOMDLG_FILTERSPEC *dlgFilterPtr) DWORD dw; for (dw = 0; dw < count; ++dw) { if (dlgFilterPtr[dw].pszName != NULL) - ckfree(dlgFilterPtr[dw].pszName); + ckfree((char *)dlgFilterPtr[dw].pszName); if (dlgFilterPtr[dw].pszSpec != NULL) - ckfree(dlgFilterPtr[dw].pszSpec); + ckfree((char *)dlgFilterPtr[dw].pszSpec); } ckfree(dlgFilterPtr); } diff --git a/win/tkWinPort.h b/win/tkWinPort.h index 965dbc5..11b60f3 100644 --- a/win/tkWinPort.h +++ b/win/tkWinPort.h @@ -21,6 +21,7 @@ *--------------------------------------------------------------------------- */ +#include <stdio.h> #include <wchar.h> #include <io.h> #include <stdlib.h> diff --git a/win/tkWinX.c b/win/tkWinX.c index f09da15..f666152 100644 --- a/win/tkWinX.c +++ b/win/tkWinX.c @@ -610,7 +610,7 @@ TkpCloseDisplay( ckfree(display->screens->root_visual); } if (display->screens->root != None) { - ckfree(display->screens->root); + ckfree((char *)display->screens->root); } if (display->screens->cmap != None) { XFreeColormap(display, display->screens->cmap); diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c index 4a198a3..4f822a7 100644 --- a/win/ttkWinXPTheme.c +++ b/win/ttkWinXPTheme.c @@ -428,8 +428,8 @@ static void DestroyElementData(void *clientData) ElementData *elementData = clientData; if (elementData->info->flags & HEAP_ELEMENT) { ckfree(elementData->info->statemap); - ckfree(elementData->info->className); - ckfree(elementData->info->elementName); + ckfree((char *)elementData->info->className); + ckfree((char *)elementData->info->elementName); ckfree(elementData->info); } ckfree(clientData); |