diff options
author | dgp <dgp@users.sourceforge.net> | 2020-03-09 16:34:46 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2020-03-09 16:34:46 (GMT) |
commit | f336629f658f0862b12cd860a4edae8b95449eb2 (patch) | |
tree | e38704da3f3289f90c91833bf10a8e91a3699088 /macosx | |
parent | 254b4fa35fd51a8b78906d5d481f4e1c3901f8b2 (diff) | |
parent | 065483ce8b22e7da470427493d68f36e6a53b80b (diff) | |
download | tcl-f336629f658f0862b12cd860a4edae8b95449eb2.zip tcl-f336629f658f0862b12cd860a4edae8b95449eb2.tar.gz tcl-f336629f658f0862b12cd860a4edae8b95449eb2.tar.bz2 |
merge 8.7
Diffstat (limited to 'macosx')
-rw-r--r-- | macosx/tclMacOSXBundle.c | 4 | ||||
-rw-r--r-- | macosx/tclMacOSXNotify.c | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/macosx/tclMacOSXBundle.c b/macosx/tclMacOSXBundle.c index 6714696..df6fbdd 100644 --- a/macosx/tclMacOSXBundle.c +++ b/macosx/tclMacOSXBundle.c @@ -12,6 +12,7 @@ */ #include "tclPort.h" +#include "tclInt.h" #ifdef HAVE_COREFOUNDATION #include <CoreFoundation/CoreFoundation.h> @@ -197,7 +198,7 @@ Tcl_MacOSXOpenBundleResources( int Tcl_MacOSXOpenVersionedBundleResources( - Tcl_Interp *dummy, + TCL_UNUSED(Tcl_Interp *), const char *bundleName, const char *bundleVersion, int hasResourceFile, @@ -208,7 +209,6 @@ Tcl_MacOSXOpenVersionedBundleResources( CFBundleRef bundleRef, versionedBundleRef = NULL; CFStringRef bundleNameRef; CFURLRef libURL; - (void)dummy; libraryPath[0] = '\0'; diff --git a/macosx/tclMacOSXNotify.c b/macosx/tclMacOSXNotify.c index 3f37193..3d4daa0 100644 --- a/macosx/tclMacOSXNotify.c +++ b/macosx/tclMacOSXNotify.c @@ -755,7 +755,7 @@ StartNotifierThread(void) void Tcl_FinalizeNotifier( - ClientData clientData) /* Not used. */ + ClientData clientData) { ThreadSpecificData *tsdPtr; @@ -942,11 +942,9 @@ Tcl_SetTimer( static void TimerWakeUp( - CFRunLoopTimerRef timer, - void *info) + TCL_UNUSED(CFRunLoopTimerRef), + TCL_UNUSED(ClientData)) { - (void)timer; - (void)info; } /* @@ -1450,12 +1448,11 @@ QueueFileEvents( static void UpdateWaitingListAndServiceEvents( - CFRunLoopObserverRef observer, + TCL_UNUSED(CFRunLoopObserverRef), CFRunLoopActivity activity, void *info) { ThreadSpecificData *tsdPtr = (ThreadSpecificData *)info; - (void)observer; if (tsdPtr->sleeping) { return; @@ -1830,14 +1827,13 @@ TclUnixWaitForFile( static TCL_NORETURN void NotifierThreadProc( - ClientData dummy) /* Not used. */ + TCL_UNUSED(ClientData)) { ThreadSpecificData *tsdPtr; fd_set readableMask, writableMask, exceptionalMask; int i, numFdBits = 0, polling; struct timeval poll = {0., 0.}, *timePtr; char buf[2]; - (void)dummy; /* * Look for file events and report them to interested threads. |