Same as previous diff: We now have sched_get_priority_min and
sched_get_priority_max.
Ok?
ciao,
dav
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 4 Nov 2010 12:05:25 -0000 1.29
+++ Makefile 7 Nov 2010 20:15:47 -0000
@@ -7,7 +7,7 @@ COMMENT = c++ cross-platform GUI toolkit
V = 2.8.11
DISTNAME = wxWidgets-${V}
PKGNAME = wxWidgets-gtk2-${V}
-REVISION = 0
+REVISION = 1
SHARED_LIBS = wx_base 2.0 \
wx_base_net 2.0 \
Index: patches/patch-configure_in
===================================================================
RCS file: /cvs/ports/x11/wxWidgets/patches/patch-configure_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure_in
--- patches/patch-configure_in 2 Nov 2010 13:10:51 -0000 1.5
+++ patches/patch-configure_in 7 Nov 2010 20:15:47 -0000
@@ -78,25 +78,3 @@ $OpenBSD: patch-configure_in,v 1.5 2010/
else
AC_MSG_WARN([Wide character support is unavailable])
fi
-@@ -5609,8 +5595,13 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
- dnl (this one can be in either libpthread or libposix4 (under
Solaris))
- dnl 3. pthread_attr_getschedparam and pthread_attr_setschedparam
- HAVE_PRIOR_FUNCS=0
-+ if test "$USE_OPENBSD" = 1; then
- AC_CHECK_FUNC(pthread_attr_getschedpolicy,
- [AC_CHECK_FUNC(pthread_attr_setschedparam,
-+ HAVE_PRIOR_FUNCS=1)])
-+ else
-+ AC_CHECK_FUNC(pthread_attr_getschedpolicy,
-+ [AC_CHECK_FUNC(pthread_attr_setschedparam,
- [AC_CHECK_FUNC(sched_get_priority_max,
- HAVE_PRIOR_FUNCS=1,
- [AC_CHECK_LIB([posix4], sched_get_priority_max,
-@@ -5622,6 +5613,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
- )]
- )]
- )
-+ fi
-
- if test "$HAVE_PRIOR_FUNCS" = 1; then
- AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS)
Index: patches/patch-src_unix_threadpsx_cpp
===================================================================
RCS file: patches/patch-src_unix_threadpsx_cpp
diff -N patches/patch-src_unix_threadpsx_cpp
--- patches/patch-src_unix_threadpsx_cpp 2 Nov 2010 13:10:52 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-src_unix_threadpsx_cpp,v 1.1 2010/11/02 13:10:52 dcoppa Exp $
---- src/unix/threadpsx.cpp.orig Thu Apr 15 11:04:33 2010
-+++ src/unix/threadpsx.cpp Thu Oct 28 07:27:58 2010
-@@ -1109,19 +1109,29 @@ wxThreadError wxThread::Create(unsigned int WXUNUSED_S
- wxLogError(_("Cannot retrieve thread scheduling policy."));
- }
-
--#ifdef __VMS__
-+#if defined(__VMS__) || defined (__OPENBSD__)
- /* the pthread.h contains too many spaces. This is a work-around */
-+ /* on OpenBSD, priority min/max are declared in libpthread private hdr */
- # undef sched_get_priority_max
- #undef sched_get_priority_min
-+#endif
-+#ifdef __VMS__
- #define sched_get_priority_max(_pol_) \
- (_pol_ == SCHED_OTHER ? PRI_FG_MAX_NP : PRI_FIFO_MAX)
- #define sched_get_priority_min(_pol_) \
- (_pol_ == SCHED_OTHER ? PRI_FG_MIN_NP : PRI_FIFO_MIN)
- #endif
-
-+#ifdef __OPENBSD__
-+// on OpenBSD, priority min/max are declared in libpthread private hdr
-+ int max_prio = 31,
-+ min_prio = 0,
-+ prio = m_internal->GetPriority();
-+#else
- int max_prio = sched_get_priority_max(policy),
- min_prio = sched_get_priority_min(policy),
- prio = m_internal->GetPriority();
-+#endif
-
- if ( min_prio == -1 || max_prio == -1 )
- {
