Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
6a530aba
Commit
6a530aba
authored
Nov 29, 2006
by
Lei Zhang
Committed by
Alexandre Julliard
Nov 30, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Fix compiles for systems with libxml2 version 2.6.14 and below.
parent
a7481a93
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
95 additions
and
0 deletions
+95
-0
configure
configure
+85
-0
configure.ac
configure.ac
+2
-0
domdoc.c
dlls/msxml3/domdoc.c
+5
-0
config.h.in
include/config.h.in
+3
-0
No files found.
configure
View file @
6a530aba
...
...
@@ -10389,6 +10389,91 @@ _ACEOF
fi
{
echo
"
$as_me
:
$LINENO
: checking for xmlNewDocPI in -lxml2"
>
&5
echo
$ECHO_N
"checking for xmlNewDocPI in -lxml2...
$ECHO_C
"
>
&6
;
}
if
test
"
${
ac_cv_lib_xml2_xmlNewDocPI
+set
}
"
=
set
;
then
echo
$ECHO_N
"(cached)
$ECHO_C
"
>
&6
else
ac_check_lib_save_LIBS
=
$LIBS
LIBS
=
"-lxml2
$ac_xml_libs
$LIBS
"
cat
>
conftest.
$ac_ext
<<
_ACEOF
/* confdefs.h. */
_ACEOF
cat
confdefs.h
>>
conftest.
$ac_ext
cat
>>
conftest.
$ac_ext
<<
_ACEOF
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char xmlNewDocPI ();
int
main ()
{
return xmlNewDocPI ();
;
return 0;
}
_ACEOF
rm
-f
conftest.
$ac_objext
conftest
$ac_exeext
if
{
(
ac_try
=
"
$ac_link
"
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_link
"
)
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
)
;
}
&&
{
ac_try
=
'test -z "$ac_c_werror_flag" || test ! -s conftest.err'
{
(
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_try
"
)
2>&5
ac_status
=
$?
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
;
}
&&
{
ac_try
=
'test -s conftest$ac_exeext'
{
(
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_try
"
)
2>&5
ac_status
=
$?
echo
"
$as_me
:
$LINENO
:
\$
? =
$ac_status
"
>
&5
(
exit
$ac_status
)
;
}
;
}
;
then
ac_cv_lib_xml2_xmlNewDocPI
=
yes
else
echo
"
$as_me
: failed program was:"
>
&5
sed
's/^/| /'
conftest.
$ac_ext
>
&5
ac_cv_lib_xml2_xmlNewDocPI
=
no
fi
rm
-f
core conftest.err conftest.
$ac_objext
conftest_ipa8_conftest.oo
\
conftest
$ac_exeext
conftest.
$ac_ext
LIBS
=
$ac_check_lib_save_LIBS
fi
{
echo
"
$as_me
:
$LINENO
: result:
$ac_cv_lib_xml2_xmlNewDocPI
"
>
&5
echo
"
${
ECHO_T
}
$ac_cv_lib_xml2_xmlNewDocPI
"
>
&6
;
}
if
test
$ac_cv_lib_xml2_xmlNewDocPI
=
yes
;
then
cat
>>
confdefs.h
<<
\
_ACEOF
#define HAVE_XMLNEWDOCPI 1
_ACEOF
fi
fi
...
...
configure.ac
View file @
6a530aba
...
...
@@ -486,6 +486,8 @@ then
XML2INCL="$ac_xml_cflags"],,$ac_xml_libs)
AC_CHECK_LIB(xml2, xmlReadMemory,
[AC_DEFINE(HAVE_XMLREADMEMORY,1,[Define if libxml2 has the xmlReadMemory function])],,$ac_xml_libs)
AC_CHECK_LIB(xml2, xmlNewDocPI,
[AC_DEFINE(HAVE_XMLNEWDOCPI,1,[Define if libxml2 has the xmlNewDocPI function])],,$ac_xml_libs)
])
CPPFLAGS="$ac_save_CPPFLAGS"
ac_xslt_libs="`$PKG_CONFIG --libs libxslt 2>/dev/null`"
...
...
dlls/msxml3/domdoc.c
View file @
6a530aba
...
...
@@ -761,6 +761,7 @@ static HRESULT WINAPI domdoc_createProcessingInstruction(
BSTR
data
,
IXMLDOMProcessingInstruction
**
pi
)
{
#ifdef HAVE_XMLNEWDOCPI
xmlNodePtr
xmlnode
;
domdoc
*
This
=
impl_from_IXMLDOMDocument
(
iface
);
xmlChar
*
xml_target
,
*
xml_content
;
...
...
@@ -778,6 +779,10 @@ static HRESULT WINAPI domdoc_createProcessingInstruction(
HeapFree
(
GetProcessHeap
(),
0
,
xml_target
);
return
S_OK
;
#else
FIXME
(
"Libxml 2.6.15 or greater required."
);
return
E_NOTIMPL
;
#endif
}
...
...
include/config.h.in
View file @
6a530aba
...
...
@@ -936,6 +936,9 @@
/* Define if you have the XKB extension */
#undef HAVE_XKB
/* Define if libxml2 has the xmlNewDocPI function */
#undef HAVE_XMLNEWDOCPI
/* Define if libxml2 has the xmlReadMemory function */
#undef HAVE_XMLREADMEMORY
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment