aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman2003-07-29 17:38:21 +0000
committerRichard M. Stallman2003-07-29 17:38:21 +0000
commit7e7ade6ebb298774d2ae3538d5a1494abab94a37 (patch)
tree009d17556772a6e05d3e6e4be3d785f779dbd921 /src
parent85cad5793c0ea4cfd3108f9519a283b59de573a6 (diff)
downloademacs-7e7ade6ebb298774d2ae3538d5a1494abab94a37.tar.gz
emacs-7e7ade6ebb298774d2ae3538d5a1494abab94a37.zip
(xim_open_dpy, xim_initialize, xim_close_dpy):
Conditionalize XIM code on HAVE_XIM.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 92c3317c106..7ffff61f361 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8024,6 +8024,7 @@ xim_open_dpy (dpyinfo, resource_name)
8024{ 8024{
8025 XIM xim; 8025 XIM xim;
8026 8026
8027#ifdef HAVE_XIM
8027 if (use_xim) 8028 if (use_xim)
8028 { 8029 {
8029 xim = XOpenIM (dpyinfo->display, dpyinfo->xrdb, resource_name, 8030 xim = XOpenIM (dpyinfo->display, dpyinfo->xrdb, resource_name,
@@ -8048,6 +8049,7 @@ xim_open_dpy (dpyinfo, resource_name)
8048 } 8049 }
8049 8050
8050 else 8051 else
8052#endif /* HAVE_XIM */
8051 dpyinfo->xim = NULL; 8053 dpyinfo->xim = NULL;
8052} 8054}
8053 8055
@@ -8122,6 +8124,7 @@ xim_initialize (dpyinfo, resource_name)
8122 struct x_display_info *dpyinfo; 8124 struct x_display_info *dpyinfo;
8123 char *resource_name; 8125 char *resource_name;
8124{ 8126{
8127#ifdef HAVE_XIM
8125 if (use_xim) 8128 if (use_xim)
8126 { 8129 {
8127#ifdef HAVE_X11R6_XIM 8130#ifdef HAVE_X11R6_XIM
@@ -8148,6 +8151,7 @@ xim_initialize (dpyinfo, resource_name)
8148 8151
8149 } 8152 }
8150 else 8153 else
8154#endif /* HAVE_XIM */
8151 dpyinfo->xim = NULL; 8155 dpyinfo->xim = NULL;
8152} 8156}
8153 8157
@@ -8158,6 +8162,7 @@ static void
8158xim_close_dpy (dpyinfo) 8162xim_close_dpy (dpyinfo)
8159 struct x_display_info *dpyinfo; 8163 struct x_display_info *dpyinfo;
8160{ 8164{
8165#ifdef HAVE_XIM
8161 if (use_xim) 8166 if (use_xim)
8162 { 8167 {
8163#ifdef HAVE_X11R6_XIM 8168#ifdef HAVE_X11R6_XIM
@@ -8171,6 +8176,7 @@ xim_close_dpy (dpyinfo)
8171 dpyinfo->xim = NULL; 8176 dpyinfo->xim = NULL;
8172 XFree (dpyinfo->xim_styles); 8177 XFree (dpyinfo->xim_styles);
8173 } 8178 }
8179#endif /* HAVE_XIM */
8174} 8180}
8175 8181
8176#endif /* not HAVE_X11R6_XIM */ 8182#endif /* not HAVE_X11R6_XIM */