<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dc7b13e1dca14faef0d56c1a750524f66893810f">https://github.com/macports/macports-ports/commit/dc7b13e1dca14faef0d56c1a750524f66893810f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new dc7b13e openmotif: update to 2.3.8
</span>dc7b13e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit dc7b13e1dca14faef0d56c1a750524f66893810f
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jan 2 14:18:05 2018 +1100
<span style='display:block; white-space:pre;color:#404040;'> openmotif: update to 2.3.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No longer requires libXt to be built with flat namespace.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/49379
</span>---
x11/openmotif/Portfile | 50 +--
x11/openmotif/files/clang-unsupported-cflags.patch | 12 +
x11/openmotif/files/patch-autogen.sh.diff | 22 -
x11/openmotif/files/patch-automake-1.13.diff | 16 -
x11/openmotif/files/patch-configure.ac.diff | 15 -
x11/openmotif/files/patch-lib-XmP.h.diff | 18 -
x11/openmotif/files/patch-uintptr_t-cast.diff | 460 ---------------------
7 files changed, 22 insertions(+), 571 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/openmotif/Portfile b/x11/openmotif/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index df84926..1b87dd6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/openmotif/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/openmotif/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,7 @@
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span>
name openmotif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.8
</span> categories x11
license LGPL
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,25 +9,20 @@ maintainers nomaintainer
</span> description The Open Motif toolkit for X11
long_description \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- This is The Open Group's full version of Motif based on \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the original OSF sources.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ This is The Open Group's full version of the Motif user interface \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ component toolkit based on the original OSF sources.
</span>
homepage http://motif.ics.com/
master_sites sourceforge:project/motif/Motif%20${version}%20Source%20Code
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname motif-${version}-src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .tgz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname motif-${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 612bb8127d0d31da6e5474edf8a5c247 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 49ecfe2a0939232ca78ce318d938044e7f751b6d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 96e1ed3c5b99d420e3e2e4eae1b5590961191a33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir motif-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 7572140bb52ba21ec2f0c85b2605e2b1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 ca9d8d67544434c5883d8d0fb684a48f8b0108bd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a4c10db68d880d3096c97cc1c995351616a90a57
</span>
depends_build \
port:pkgconfig \
port:xbitmaps \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span> port:bison \
port:flex
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,39 +37,18 @@ depends_lib \
</span> port:xorg-libXp \
port:xorg-libXt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-require_active_variants xorg-libXt flat_namespace
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-uintptr_t-cast.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-lib-XmP.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-autogen.sh.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-automake-1.13.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See #42847
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://trac.macports.org/ticket/42847
</span> if {[string match "*clang*" ${configure.compiler}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Looks like a botched cvs rename - identical files with an 'Exm' name
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # prefix exist. Only a problem because of a case-conflict with libc's
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # string.h.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${worksrcpath}/demos/lib/Exm/String.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/demos/lib/Exm/StringP.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/demos/lib/Exm/String.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append clang-unsupported-cflags.patch
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "./autogen.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> configure.args --enable-xft \
--enable-jpeg \
--enable-png \
--x-includes=${prefix}/include \
--x-libraries=${prefix}/lib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append YACC="${prefix}/bin/bison -y"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env YACC="${prefix}/bin/bison -y"
</span>
post-destroot {
set docdir ${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,5 +56,3 @@ post-destroot {
</span> xinstall -m 0644 -W ${worksrcpath} BUGREPORT COPYING ChangeLog \
README RELNOTES TODO ${destroot}${docdir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/openmotif/files/clang-unsupported-cflags.patch b/x11/openmotif/files/clang-unsupported-cflags.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c3ae36a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/openmotif/files/clang-unsupported-cflags.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2017-12-05 23:49:56.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-01-02 13:49:42.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14840,9 +14840,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x$GCC = xyes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="$CFLAGS -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CFLAGS="$CFLAGS -fno-tree-ter"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "#define NO_OL_COMPAT 1" >>confdefs.h
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/openmotif/files/patch-autogen.sh.diff b/x11/openmotif/files/patch-autogen.sh.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 321aa04..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/openmotif/files/patch-autogen.sh.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- autogen.sh.orig 2012-10-23 01:50:34.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ autogen.sh 2012-11-03 18:11:51.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,18 +7,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cd "$srcdir"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--libtoolize --force --automake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+glibtoolize --force --automake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- aclocal -I .
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoheader
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- automake --foreign --include-deps --add-missing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test -z "$*"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "I am going to run ./configure with no arguments - if you wish "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- echo "to pass any to it, please specify them on the $0 command line."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--cd "$THEDIR"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$srcdir/configure "$@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/openmotif/files/patch-automake-1.13.diff b/x11/openmotif/files/patch-automake-1.13.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c5c9ae7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/openmotif/files/patch-automake-1.13.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2012-10-22 07:50:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2013-01-02 21:39:49.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,12 +31,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl AC_DISABLE_STATIC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_CONFIG_HEADER(include/config.h lib/Xm/Xm.h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+AC_CONFIG_HEADERS([include/config.h lib/Xm/Xm.h])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Checks for programs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_CC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_PROG_CPP
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_PROG_CC_STDC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_PROG_LIBTOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_EXEEXT
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/openmotif/files/patch-configure.ac.diff b/x11/openmotif/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1f89b98..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/openmotif/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2014-04-05 08:43:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2014-04-05 08:43:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -164,9 +164,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test x$GCC = xyes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS="$CFLAGS -Wall -g -fno-strict-aliasing -Wno-unused -Wno-comment"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CFLAGS="$CFLAGS -fno-tree-ter"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #if test ` $CC -dumpversion | sed -e 's/\(^.\).*/\1/'` = "4" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # CFLAGS="$CFLAGS -fno-tree-ter"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE(NO_OL_COMPAT, 1, "No OL Compatability")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/openmotif/files/patch-lib-XmP.h.diff b/x11/openmotif/files/patch-lib-XmP.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0fb04b2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/openmotif/files/patch-lib-XmP.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/XmP.h.orig 2012-10-23 01:50:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/XmP.h 2012-11-03 17:45:45.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1442,9 +1442,13 @@ extern void _XmDestroyParentCallback(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* NO_XM_1_2_BC */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __GNUC__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define XM_DEPRECATED __attribute__((__deprecated__))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# define XM_ALIAS(sym) __attribute__((__weak__,alias(#sym)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifndef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define XM_ALIAS(sym) __attribute__((__weak__,alias(#sym)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define XM_ALIAS(sym)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define XM_DEPRECATED
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # define XM_ALIAS(sym)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/openmotif/files/patch-uintptr_t-cast.diff b/x11/openmotif/files/patch-uintptr_t-cast.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0263c6c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/openmotif/files/patch-uintptr_t-cast.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,460 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/DragBS.c.org 2009-08-29 10:27:40.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/DragBS.c 2009-08-29 10:31:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -217,9 +217,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static unsigned long firstProtectRequest;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static Window errorWindow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static XContext displayToMotifWindowContext = (XContext) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static XContext displayToTargetsContext = (XContext) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static XContext displayToAtomsContext = (XContext) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static XContext displayToMotifWindowContext = (XContext)(uintptr_t) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static XContext displayToTargetsContext = (XContext)(uintptr_t) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static XContext displayToAtomsContext = (XContext)(uintptr_t) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*****************************************************************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -304,7 +304,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XContext loc_context;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessLock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (displayToMotifWindowContext == (XContext) NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (displayToMotifWindowContext == (XContext)(uintptr_t) NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- displayToMotifWindowContext = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- loc_context = displayToMotifWindowContext;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -335,7 +335,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XContext loc_context;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessLock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (displayToMotifWindowContext == (XContext) NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (displayToMotifWindowContext == (XContext)(uintptr_t) NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- displayToMotifWindowContext = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- loc_context = displayToMotifWindowContext;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -378,7 +378,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XContext loc_context;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessLock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (displayToTargetsContext == (XContext) NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (displayToTargetsContext == (XContext)(uintptr_t) NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- displayToTargetsContext = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- loc_context = displayToTargetsContext;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -409,7 +409,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XContext loc_context;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessLock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (displayToTargetsContext == (XContext) NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (displayToTargetsContext == (XContext)(uintptr_t) NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- displayToTargetsContext = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- loc_context = displayToTargetsContext;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -464,7 +464,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XContext loc_context;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessLock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (displayToAtomsContext == (XContext) NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (displayToAtomsContext == (XContext)(uintptr_t) NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- displayToAtomsContext = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- loc_context = displayToAtomsContext;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -495,7 +495,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XContext loc_context;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessLock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (displayToAtomsContext == (XContext) NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (displayToAtomsContext == (XContext)(uintptr_t) NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- displayToAtomsContext = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- loc_context = displayToAtomsContext;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/DragIcon.c.org 2009-08-29 10:39:24.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/DragIcon.c 2009-08-29 10:40:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -760,7 +760,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef Offset
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define Offset(x) (XtOffsetOf( struct _XmDragIconRec, drag.x))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static XContext _XmTextualDragIconContext = (XContext) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static XContext _XmTextualDragIconContext = (XContext)(uintptr_t) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static XtResource resources[]=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1240,7 +1240,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_alt = dpy -> display.enable_drag_icon;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessLock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (_XmTextualDragIconContext == (XContext) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (_XmTextualDragIconContext == (XContext)(uintptr_t) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmTextualDragIconContext = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- loc_context = _XmTextualDragIconContext;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessUnlock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/Text.c.org 2009-08-29 10:42:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/Text.c 2009-08-29 10:43:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -654,14 +654,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmCreateCutBuffers(Widget w)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static XContext context = (XContext)NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static XContext context = (XContext)(uintptr_t)NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char * tmp = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Display *dpy = XtDisplay(w);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Screen *screen = XtScreen(w);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XContext local_context;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessLock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (context == (XContext)NULL) context = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (context == (XContext)(uintptr_t)NULL) context = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- local_context = context;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessUnlock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3023,7 +3023,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!tw->text.editable && editable) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OutputData o_data = tw->text.output->data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XmImRegister(widget, (unsigned int) NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ XmImRegister(widget, (unsigned int)(uintptr_t) NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (*tw->text.output->PosToXY)(tw, tw->text.cursor_position,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &xmim_point.x, &xmim_point.y);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/TextF.c.org 2009-08-29 10:46:06.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/TextF.c 2009-08-29 10:47:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7306,7 +7306,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XmTextFieldSetEditable((Widget)tf, TextF_Editable(tf));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (TextF_Editable(tf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XmImRegister((Widget)tf, (unsigned int) NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ XmImRegister((Widget)tf, (unsigned int)(uintptr_t) NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GetXYFromPos(tf, TextF_CursorPosition(tf), &xmim_point.x, &xmim_point.y);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (void)TextFieldGetDisplayRect((Widget)tf, &xmim_area);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- n = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8178,7 +8178,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- diff_values = True;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (TextF_WcValue(new_tf) == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TextF_WcValue(new_tf) = (wchar_t*) XtMalloc(sizeof(wchar_t));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *TextF_WcValue(new_tf) = (wchar_t)NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *TextF_WcValue(new_tf) = (wchar_t)(uintptr_t)NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ValidateString(new_tf, (char*)TextF_WcValue(new_tf), True);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (TextF_Value(new_tf) != TextF_Value(old_tf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10091,7 +10091,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * give the IM the relevent values. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!TextF_Editable(tf) && editable) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XmImRegister((Widget)tf, (unsigned int) NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ XmImRegister((Widget)tf, (unsigned int)(uintptr_t) NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GetXYFromPos(tf, TextF_CursorPosition(tf), &xmim_point.x,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &xmim_point.y);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/Protocols.c.org 2009-08-29 10:48:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/Protocols.c 2009-08-29 10:49:20.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -136,7 +136,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ***************************************************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static XContext allProtocolsMgrContext = (XContext) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static XContext allProtocolsMgrContext = (XContext)(uintptr_t) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define Offset(field) XtOffsetOf( struct _XmProtocolRec, protocol.field)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -374,7 +374,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- display = XtDisplay(shell);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessLock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (allProtocolsMgrContext == (XContext) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (allProtocolsMgrContext == (XContext)(uintptr_t) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- allProtocolsMgrContext = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessUnlock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/VendorS.c.org 2009-08-29 10:50:33.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/VendorS.c 2009-08-29 10:51:00.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1576,8 +1576,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ttp->post_delay = 5000;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ttp->post_duration = 5000;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ttp->enable = False;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ttp->timer = (int) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ttp->duration_timer = (int) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ttp->timer = (int)(uintptr_t) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ttp->duration_timer = (int)(uintptr_t) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ttp->leave_time = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ttp->slider = ttp->label = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/Synthetic.c.org 2009-08-29 10:52:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/Synthetic.c 2009-08-29 10:54:51.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -197,7 +197,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0; i < num_resources; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- resources[i].resource_name =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (String) XrmPermStringToQuark (resources[i].resource_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (String)(uintptr_t) XrmPermStringToQuark (resources[i].resource_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /**********************************************************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -241,7 +241,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (j = 0; j < num_resources; j++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((resources[j].export_proc) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (XrmQuark)(resources[j].resource_name) == quark)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (XrmQuark)(uintptr_t)(resources[j].resource_name) == quark)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- value_size = resources[j].resource_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -512,7 +512,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (j = 0; j < num_resources; j++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((resources[j].import_proc) &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (XrmQuark)(resources[j].resource_name) == quark)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (XrmQuark)(uintptr_t)(resources[j].resource_name) == quark)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- value = args[i].value;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/Obso2_0.c.org 2009-08-29 10:56:29.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/Obso2_0.c 2009-08-29 10:57:39.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1584,7 +1584,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Stuff from Desktop.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **********************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static XContext actualClassContext = (XContext) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static XContext actualClassContext = (XContext)(uintptr_t) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*ARGSUSED*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1611,7 +1611,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WidgetClass actualClass;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (actualClassContext == (XContext) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (actualClassContext == (XContext)(uintptr_t) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- actualClassContext = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1645,7 +1645,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WidgetClass previous;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WidgetClass oldActualClass;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (actualClassContext == (XContext) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (actualClassContext == (XContext)(uintptr_t) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- actualClassContext = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1692,7 +1692,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cardinal *num_args )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XmDesktopObject worldObject;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static XContext worldObjectContext = (XContext) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static XContext worldObjectContext = (XContext)(uintptr_t) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XmWidgetExtData ext;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Display *display;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1701,7 +1701,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ** the display is closed, so that we don't get bad data if a second
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ** display with the same id is opened.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (worldObjectContext == (XContext) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (worldObjectContext == (XContext)(uintptr_t) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worldObjectContext = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- display = XtDisplayOfObject(shell);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/Xpmparse.c.org 2009-08-29 10:58:47.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/Xpmparse.c 2009-08-29 11:28:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -387,7 +387,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (USE_HASHTABLE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ErrorStatus =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- xpmHashIntern(hashtable, color->string, HashAtomData(a));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xpmHashIntern(hashtable, color->string, HashAtomData((uintptr_t)a));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ErrorStatus != XpmSuccess) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xpmFreeColorTable(colorTable, ncolors);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (ErrorStatus);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -475,7 +475,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (USE_HASHTABLE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ErrorStatus =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- xpmHashIntern(hashtable, color->string, HashAtomData(a));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ xpmHashIntern(hashtable, color->string, HashAtomData((uintptr_t)a));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (ErrorStatus != XpmSuccess) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xpmFreeColorTable(colorTable, ncolors);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (ErrorStatus);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/SlideC.c.org 2009-08-29 11:52:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/SlideC.c 2009-08-29 11:52:48.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,14 +94,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* notify that initialize called XtArgsProc */ NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* NULL XtProc */ NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* NULL XtPointer */ NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* NULL Cardinal */ (Cardinal)NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* NULL Cardinal */ (Cardinal)(uintptr_t)NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* resources for subclass fields XtResourceList */ resources,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* number of entries in resources Cardinal */ XtNumber(resources),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* resource class quarkified XrmClass */ NULLQUARK,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* NULL Boolean */ (Boolean)NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* NULL XtEnum */ (XtEnum)NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* NULL Boolean */ (Boolean)NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--/* NULL Boolean */ (Boolean)NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* NULL Boolean */ (Boolean)(uintptr_t)NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* NULL XtEnum */ (XtEnum)(uintptr_t)NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* NULL Boolean */ (Boolean)(uintptr_t)NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* NULL Boolean */ (Boolean)(uintptr_t)NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* free data for subclass pointers XtWidgetProc */ destroy,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* NULL XtProc */ NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* NULL XtProc */ NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/DataF.c.org 2009-08-29 11:54:23.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/DataF.c 2009-08-29 11:57:32.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9121,7 +9121,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* CR03685 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SGI_hack_XmImRegister((Widget)tf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XmImRegister((Widget)tf, (unsigned int) NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ XmImRegister((Widget)tf, (unsigned int)(uintptr_t) NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- df_GetXYFromPos(tf, XmTextF_cursor_position(tf), &xmim_point.x, &xmim_point.y);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- n = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10631,7 +10631,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- diff_values = True;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (XmTextF_wc_value(new_tf) == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XmTextF_wc_value(new_tf) = (wchar_t*) XtMalloc(sizeof(wchar_t));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *XmTextF_wc_value(new_tf) = (wchar_t)NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *XmTextF_wc_value(new_tf) = (wchar_t)(uintptr_t)NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- df_ValidateString(new_tf, (char*)XmTextF_wc_value(new_tf), True);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else if (XmTextF_value(new_tf) != XmTextF_value(old_tf)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11777,7 +11777,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* CR03685 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SGI_hack_XmImRegister((Widget)tf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XmImRegister((Widget)tf, (unsigned int) NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ XmImRegister((Widget)tf, (unsigned int)(uintptr_t) NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- df_GetXYFromPos(tf, XmTextF_cursor_position(tf), &xmim_point.x,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &xmim_point.y);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/FontS.c.org 2009-08-29 11:59:14.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/FontS.c 2009-08-29 12:04:10.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2748,7 +2748,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XmStringFree(label);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XtAddCallback(button,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XmNactivateCallback, ChangeEncoding, (XtPointer) i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ XmNactivateCallback, ChangeEncoding, (XtPointer)(uintptr_t) i);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (streq(*encodings, ENCODING_STRING(fsw)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2910,7 +2910,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fsw = (XmFontSelectorWidget) w;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cf = XmFontS_font_info(fsw)->current_font;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((int) data == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((int)(uintptr_t) data == 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XtFree(ENCODING_STRING(fsw));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENCODING_STRING(fsw) = XtNewString(ANY_ENCODING);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2918,7 +2918,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XtFree(ENCODING_STRING(fsw));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ENCODING_STRING(fsw) = XtNewString(ENCODING_LIST(fsw)[(int) data - 1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ENCODING_STRING(fsw) = XtNewString(ENCODING_LIST(fsw)[(int)(uintptr_t) data - 1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UpdateFamilies(fsw);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3676,7 +3676,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- num_largs = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XtSetArg(largs[num_largs], XmNmenuHistory, button); num_largs++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XtSetValues(XmFontS_option_menu(set_fsw), largs, num_largs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ChangeEncoding((Widget) set_fsw, (XtPointer) current, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ChangeEncoding((Widget) set_fsw, (XtPointer)(uintptr_t) current, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- clients/mwm/WmResParse.c.org 2009-08-29 12:07:12.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ clients/mwm/WmResParse.c 2009-08-29 12:10:22.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -188,7 +188,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"mod3", Mod3Mask},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"mod4", Mod4Mask},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"mod5", Mod5Mask},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {NULL, (unsigned int)NULL},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {NULL, (unsigned int)(uintptr_t)NULL},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ALT_INDEX 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -351,14 +351,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"btn5up", ButtonRelease, ParseImmed, Button5, FALSE},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"btn5click", ButtonRelease, ParseImmed, Button5, TRUE},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"btn5click2", ButtonPress, ParseImmed, Button5, TRUE},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { NULL, (unsigned int)NULL, (Boolean(*)())NULL, (unsigned int)NULL, (Boolean)NULL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { NULL, (unsigned int)(uintptr_t)NULL, (Boolean(*)())NULL, (unsigned int)(uintptr_t)NULL, (Boolean)(uintptr_t)NULL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static EventTableEntry keyEvents[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"key", KeyPress, ParseKeySym, 0, FALSE},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { NULL, (unsigned int)NULL, (Boolean(*)())NULL, (unsigned int)NULL, (Boolean)NULL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ { NULL, (unsigned int)(uintptr_t)NULL, (Boolean(*)())NULL, (unsigned int)(uintptr_t)NULL, (Boolean)(uintptr_t)NULL}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef PANELIST
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/IconG.c.org 2009-08-29 12:26:45.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/IconG.c 2009-08-29 12:27:15.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -279,8 +279,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* those are created in ClassInitialize and filled by the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IconConverter. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static XContext largeIconContext = (XContext) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static XContext smallIconContext = (XContext) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static XContext largeIconContext = (XContext)(uintptr_t) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static XContext smallIconContext = (XContext)(uintptr_t) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static XPointer dummy;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define OwnLargeMask(widget) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- clients/mwm/WmMenu.c.org 2009-08-29 12:45:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ clients/mwm/WmMenu.c 2009-08-29 12:47:09.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -861,8 +861,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static MenuItem *MakeClientCommandMenuItem (String label, String funcArgs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return(MakeMenuItem(label, F_InvokeCommand, funcArgs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (KeySym) NULL, (unsigned int)0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (KeyCode) NULL, (String)NULL));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (KeySym)(uintptr_t) NULL, (unsigned int)0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (KeyCode)(uintptr_t) NULL, (String)(uintptr_t)NULL));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2216,7 +2216,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (newMenuSpec == (MenuSpec *) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- newMenuSpec = MakeMenuSpec(funcarg_buf,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- tree == NULL ? (CARD32)NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ tree == NULL ? (CARD32)(uintptr_t)NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : tree->commandID);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (duplicate_globals) newMenuSpec->clientLocal = TRUE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else newMenuSpec->clientLocal = FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/XpmI.h.org 2009-08-29 13:19:19.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/XpmI.h 2009-08-29 13:20:13.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -291,7 +291,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FUNC(xpmHashIntern, int, (xpmHashTable *table, char *tag, void *data));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define HashAtomData(i) ((void *)i)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define HashColorIndex(slot) ((unsigned int)((*slot)->data))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define HashColorIndex(slot) ((unsigned int)(uintptr_t)((*slot)->data))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define USE_HASHTABLE (cpp > 2 && ncolors > 4)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* I/O utility */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/BaseClass.c.org 2009-08-29 13:31:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/BaseClass.c 2009-08-29 13:32:05.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -577,7 +577,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static ExtToContextRec extToContextMap[16];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Cardinal i;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ExtToContext curr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- XContext context = (XContext) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ XContext context = (XContext)(uintptr_t) NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _XmProcessLock();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (i = 0, curr = &extToContextMap[0];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/Xm/XmIm.c.org 2009-08-29 13:33:41.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/Xm/XmIm.c 2009-08-29 13:33:59.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2499,7 +2499,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (void) add_ref(&xic_info->widget_refs, widget);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Set the current XIC for this widget. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (xim_info->current_xics == (XContext) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (xim_info->current_xics == (XContext)(uintptr_t) NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xim_info->current_xics = XUniqueContext();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (void) XSaveContext(XtDisplay(widget), (XID) widget,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xim_info->current_xics, (XPointer) xic_info);
</span></pre><pre style='margin:0'>
</pre>