Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Disable XInitThreads() call until we have a better test for it. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
76c4cb62a102ee3ccd353f9ce9967f7e |
| User & Date: | jan.nijtmans 2013-05-24 12:29:23 |
Context
|
2013-06-03
| ||
| 20:28 | merge 8.5 check-in: 0705864c user: dgp tags: trunk | |
|
2013-05-24
| ||
| 12:29 | Disable XInitThreads() call until we have a better test for it. check-in: 76c4cb62 user: jan.nijtmans tags: trunk | |
|
2013-05-23
| ||
| 13:31 | Extra bit of safety. Since we check whether xinitMutex is "still NULL" to detect a threads-disabled Tcl, we should be explicitly certain it has an initial value of NULL. check-in: 7779a1c4 user: dgp tags: trunk | |
Changes
Changes to unix/configure.
| ︙ | ︙ | |||
10768 10769 10770 10771 10772 10773 10774 |
LIBS=$tk_oldLibs
fi
#--------------------------------------------------------------------
# Check whether XKeycodeToKeysym is deprecated in X11 headers.
#--------------------------------------------------------------------
| | | 10768 10769 10770 10771 10772 10773 10774 10775 10776 10777 10778 10779 10780 10781 10782 |
LIBS=$tk_oldLibs
fi
#--------------------------------------------------------------------
# Check whether XKeycodeToKeysym is deprecated in X11 headers.
#--------------------------------------------------------------------
if test $tk_aqua = no && test "$GCC" = yes; then
echo "$as_me:$LINENO: checking whether XKeycodeToKeysym is deprecated" >&5
echo $ECHO_N "checking whether XKeycodeToKeysym is deprecated... $ECHO_C" >&6
tk_oldCFlags=$CFLAGS
CFLAGS="$CFLAGS -Werror"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
|
| ︙ | ︙ | |||
10815 10816 10817 10818 10819 10820 10821 |
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
| > > > > > > > > | < < < < < < | 10815 10816 10817 10818 10819 10820 10821 10822 10823 10824 10825 10826 10827 10828 10829 10830 10831 10832 10833 10834 10835 10836 10837 10838 10839 10840 10841 10842 10843 10844 |
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
cat >>confdefs.h <<\_ACEOF
#define XKEYCODETOKEYSYM_IS_DEPRECATED 1
_ACEOF
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
CFLAGS=$tk_oldCFlags
fi
#--------------------------------------------------------------------
|
| ︙ | ︙ |
Changes to unix/configure.in.
| ︙ | ︙ | |||
588 589 590 591 592 593 594 |
LIBS=$tk_oldLibs
fi
#--------------------------------------------------------------------
# Check whether XKeycodeToKeysym is deprecated in X11 headers.
#--------------------------------------------------------------------
| | > > | < > | 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 |
LIBS=$tk_oldLibs
fi
#--------------------------------------------------------------------
# Check whether XKeycodeToKeysym is deprecated in X11 headers.
#--------------------------------------------------------------------
if test $tk_aqua = no && test "$GCC" = yes; then
AC_MSG_CHECKING([whether XKeycodeToKeysym is deprecated])
tk_oldCFlags=$CFLAGS
CFLAGS="$CFLAGS -Werror"
AC_TRY_LINK([
#include <X11/Xlib.h>
], [
XKeycodeToKeysym(0,0,0);
], [
AC_MSG_RESULT([no])
], [
AC_MSG_RESULT([yes])
AC_DEFINE(XKEYCODETOKEYSYM_IS_DEPRECATED, 1, [Is XKeycodeToKeysym deprecated?])
])
CFLAGS=$tk_oldCFlags
fi
#--------------------------------------------------------------------
# XXX Do this last.
# It might modify XLIBSW which could affect other tests.
#
|
| ︙ | ︙ |
Changes to unix/tkUnixEvent.c.
| ︙ | ︙ | |||
124 125 126 127 128 129 130 |
Display *display;
int event = 0;
int error = 0;
int major = 1;
int minor = 0;
int reason = 0;
unsigned int use_xkb = 0;
| > | | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 |
Display *display;
int event = 0;
int error = 0;
int major = 1;
int minor = 0;
int reason = 0;
unsigned int use_xkb = 0;
/* Disabled, until we have a better test. See [Bug 3613668] */
#if 0 && defined(XKEYCODETOKEYSYM_IS_DEPRECATED) && defined(TCL_THREADS)
static int xinited = 0;
static Tcl_Mutex xinitMutex = NULL;
if (!xinited) {
Tcl_MutexLock(&xinitMutex);
if (!xinited) {
/* Necessary for threaded apps, of no consequence otherwise */
|
| ︙ | ︙ |