Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
75e40229
Commit
75e40229
authored
16 years ago
by
Kusanagi Kouichi
Committed by
Alexandre Julliard
16 years ago
Browse files
Options
Downloads
Patches
Plain Diff
winex11.drv: Fix Solaris build error.
Solaris doesn't define XICCallback.
parent
6165d87f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
configure
+109
-0
109 additions, 0 deletions
configure
configure.ac
+6
-0
6 additions, 0 deletions
configure.ac
dlls/winex11.drv/xim.c
+11
-9
11 additions, 9 deletions
dlls/winex11.drv/xim.c
include/config.h.in
+3
-0
3 additions, 0 deletions
include/config.h.in
with
129 additions
and
9 deletions
configure
+
109
−
0
View file @
75e40229
...
...
@@ -10686,6 +10686,115 @@ esac
fi
{ echo "$as_me:$LINENO: checking for XICCallback.callback" >&5
echo $ECHO_N "checking for XICCallback.callback... $ECHO_C" >&6; }
if test "${ac_cv_member_XICCallback_callback+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef HAVE_X11_XLIB_H
#include <X11/Xlib.h>
#endif
int
main ()
{
static XICCallback ac_aggr;
if (ac_aggr.callback)
return 0;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_member_XICCallback_callback=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifdef HAVE_X11_XLIB_H
#include <X11/Xlib.h>
#endif
int
main ()
{
static XICCallback ac_aggr;
if (sizeof ac_aggr.callback)
return 0;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (ac_try="$ac_compile"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_member_XICCallback_callback=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_member_XICCallback_callback=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_member_XICCallback_callback" >&5
echo "${ECHO_T}$ac_cv_member_XICCallback_callback" >&6; }
if test $ac_cv_member_XICCallback_callback = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_XICCALLBACK_CALLBACK 1
_ACEOF
fi
opengl_msg=""
if test "x$with_opengl" != "xno"
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
6
−
0
View file @
75e40229
...
...
@@ -698,6 +698,12 @@ then
WINE_NOTICE_WITH(xcomposite,[test "x$ac_cv_lib_soname_Xcomposite" = "x"],
[libxcomposite development files not found, Xcomposite won't be supported.])
dnl *** Check for XICCallback struct
AC_CHECK_MEMBERS([XICCallback.callback],,,
[#ifdef HAVE_X11_XLIB_H
#include <X11/Xlib.h>
#endif])
dnl *** End of X11/Xlib.h check
dnl Check for the presence of OpenGL
...
...
This diff is collapsed.
Click to expand it.
dlls/winex11.drv/xim.c
+
11
−
9
View file @
75e40229
...
...
@@ -35,6 +35,11 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
x11drv
);
#ifndef HAVE_XICCALLBACK_CALLBACK
#define XICCallback XIMCallback
#define XICProc XIMProc
#endif
BOOL
ximInComposeMode
=
FALSE
;
/* moved here from imm32 for dll separation */
...
...
@@ -501,11 +506,8 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data)
XVaNestedList
preedit
=
NULL
;
XVaNestedList
status
=
NULL
;
XIC
xic
;
XICCallback
destroy
=
{(
XPointer
)
data
,
X11DRV_DestroyIC
};
XIMCallback
P_StartCB
;
XIMCallback
P_DoneCB
;
XIMCallback
P_DrawCB
;
XIMCallback
P_CaretCB
;
XICCallback
destroy
=
{(
XPointer
)
data
,
(
XICProc
)
X11DRV_DestroyIC
};
XICCallback
P_StartCB
,
P_DoneCB
,
P_DrawCB
,
P_CaretCB
;
LANGID
langid
=
PRIMARYLANGID
(
LANGIDFROMLCID
(
GetThreadLocale
()));
Window
win
=
data
->
whole_window
;
...
...
@@ -531,13 +533,13 @@ XIC X11DRV_CreateIC(XIM xim, struct x11drv_win_data *data)
/* create callbacks */
P_StartCB
.
client_data
=
NULL
;
P_StartCB
.
callback
=
(
XIMProc
)
XIMPreEditStartCallback
;
P_DoneCB
.
client_data
=
NULL
;
P_DoneCB
.
callback
=
(
XIMProc
)
XIMPreEditDoneCallback
;
P_DrawCB
.
client_data
=
NULL
;
P_DrawCB
.
callback
=
(
XIMProc
)
XIMPreEditDrawCallback
;
P_CaretCB
.
client_data
=
NULL
;
P_CaretCB
.
callback
=
(
XIMProc
)
XIMPreEditCaretCallback
;
P_StartCB
.
callback
=
(
XICProc
)
XIMPreEditStartCallback
;
P_DoneCB
.
callback
=
(
XICProc
)
XIMPreEditDoneCallback
;
P_DrawCB
.
callback
=
(
XICProc
)
XIMPreEditDrawCallback
;
P_CaretCB
.
callback
=
(
XICProc
)
XIMPreEditCaretCallback
;
if
((
ximStyle
&
(
XIMPreeditNothing
|
XIMPreeditNone
))
==
0
)
{
...
...
This diff is collapsed.
Click to expand it.
include/config.h.in
+
3
−
0
View file @
75e40229
...
...
@@ -945,6 +945,9 @@
/* Define to 1 if you have the <X11/Xutil.h> header file. */
#undef HAVE_X11_XUTIL_H
/* Define to 1 if `callback' is member of `XICCallback'. */
#undef HAVE_XICCALLBACK_CALLBACK
/* Define if you have the XKB extension */
#undef HAVE_XKB
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment