diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-01 22:11:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-01 22:11:42 (GMT) |
| commit | 5931b9b61e7df9c4fe0a28265d9ffd7e1c73f874 (patch) | |
| tree | a0bde1f91ae1999e97bd3eee329491f32b54696a /unix | |
| parent | 1d2fbf0b67d3ebfca3632d712654d9bc01af76dd (diff) | |
| download | tk-5931b9b61e7df9c4fe0a28265d9ffd7e1c73f874.zip tk-5931b9b61e7df9c4fe0a28265d9ffd7e1c73f874.tar.gz tk-5931b9b61e7df9c4fe0a28265d9ffd7e1c73f874.tar.bz2 | |
Fix many warnings in MacOSX build (caused by -Wextra -Wc++-compat). All harmless. Not finished yet.
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/tkUnixFont.c | 4 | ||||
| -rw-r--r-- | unix/tkUnixInit.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c index 800d1e5..c1e9264 100644 --- a/unix/tkUnixFont.c +++ b/unix/tkUnixFont.c @@ -848,7 +848,7 @@ TkpGetFontFamilies( Tk_Window tkwin) /* For display to query. */ { int i, isNew, numNames; - const char *family, **nameList; + char *family, **nameList; Tcl_HashTable familyTable; Tcl_HashEntry *hPtr; Tcl_HashSearch search; @@ -857,7 +857,7 @@ TkpGetFontFamilies( Tcl_InitHashTable(&familyTable, TCL_STRING_KEYS); nameList = ListFonts(Tk_Display(tkwin), "*", &numNames); for (i = 0; i < numNames; i++) { - const char *familyEnd; + char *familyEnd; family = strchr(nameList[i] + 1, '-'); if (family == NULL) { diff --git a/unix/tkUnixInit.c b/unix/tkUnixInit.c index 6fa7970..0965c01 100644 --- a/unix/tkUnixInit.c +++ b/unix/tkUnixInit.c @@ -14,7 +14,7 @@ #ifdef HAVE_COREFOUNDATION static int GetLibraryPath(Tcl_Interp *interp); #else -#define GetLibraryPath(dummy) (void)0 +#define GetLibraryPath(dummy) (void)dummy #endif /* HAVE_COREFOUNDATION */ /* @@ -37,10 +37,8 @@ static int GetLibraryPath(Tcl_Interp *interp); int TkpInit( - Tcl_Interp *dummy) + Tcl_Interp *interp) { - (void)dummy; - TkCreateXEventSource(); GetLibraryPath(interp); return TCL_OK; |