Date: Wed, 27 Jan 2021 02:43:02 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r563024 - head/x11-toolkits/fox17/files Message-ID: <202101270243.10R2h2GA000127@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Wed Jan 27 02:43:02 2021 New Revision: 563024 URL: https://svnweb.freebsd.org/changeset/ports/563024 Log: x11-toolkits/fox17: Fix build on FreeBSD 12.2. pthread_getname_np() was MFC'd in r362264 and I didn't take into account in the original patch. FXThread.cpp:970:8: error: no matching function for call to 'pthread_getname_np' if(pthread_getname_np(tid,desc,ARRAYNUMBER(desc))==0){ ^~~~~~~~~~~~~~~~~~ /usr/include/pthread.h:305:6: note: candidate function not viable: no known conversion from 'const volatile FX::FXThreadID' (aka 'const volatile unsigned long') to 'pthread_t' (aka 'pthread *') for 1st argument int pthread_getname_np(pthread_t, char *, size_t); Reported by: pkg-fallout Modified: head/x11-toolkits/fox17/files/patch-lib_FXThread.cpp Modified: head/x11-toolkits/fox17/files/patch-lib_FXThread.cpp ============================================================================== --- head/x11-toolkits/fox17/files/patch-lib_FXThread.cpp Wed Jan 27 02:05:30 2021 (r563023) +++ head/x11-toolkits/fox17/files/patch-lib_FXThread.cpp Wed Jan 27 02:43:02 2021 (r563024) @@ -35,7 +35,7 @@ int pthread_getname_np(pthread_t, char *, if(pthread_getname_np(tid,desc,ARRAYNUMBER(desc))==0){ + return desc; + } -+#elif defined(__FreeBSD__) && (__FreeBSD_version >= 1300098) ++#elif defined(__FreeBSD__) && ((__FreeBSD_version >= 1201518 && __FreeBSD_version < 1300000) || (__FreeBSD_version >= 1300098)) + FXchar desc[256]; + if(pthread_getname_np((pthread_t)tid,desc,ARRAYNUMBER(desc))==0){ return desc;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101270243.10R2h2GA000127>