Kaydet (Commit) e3b2030c authored tarafından Luboš Luňák's avatar Luboš Luňák Kaydeden (comit) Cédric Bosdonnat

libcmis: fixed some conflict with windows.h definitions

Change-Id: I5f121cbeff3f0cda5776d5361e585eaa1b48ea63
üst 7a182026
...@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0)) ...@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0))
$(eval $(call gb_UnpackedTarball_add_patches,cmis, \ $(eval $(call gb_UnpackedTarball_add_patches,cmis, \
libcmis/libcmis-0.3.0-warnings.patch \ libcmis/libcmis-0.3.0-warnings.patch \
libcmis/libcmis-0.3.0-win.patch \
)) ))
ifeq ($(OS)$(COM),WNTMSC) ifeq ($(OS)$(COM),WNTMSC)
......
diff --git src/libcmis/ws-objectservice.cxx src/libcmis/ws-objectservice.cxx
index df624de..5134d8e 100644
--- src/libcmis/ws-objectservice.cxx
+++ src/libcmis/ws-objectservice.cxx
@@ -119,7 +119,7 @@ libcmis::ObjectPtr ObjectService::updateProperties(
void ObjectService::deleteObject( string repoId, string id, bool allVersions ) throw ( libcmis::Exception )
{
- DeleteObject request( repoId, id, allVersions );
+ class DeleteObject request( repoId, id, allVersions );
m_session->soapRequest( m_url, request );
}
diff --git src/libcmis/ws-requests.hxx src/libcmis/ws-requests.hxx
index 88fe5b9..6de94b8 100644
--- src/libcmis/ws-requests.hxx
+++ src/libcmis/ws-requests.hxx
@@ -202,6 +202,7 @@ class GetTypeChildrenResponse : public SoapResponse
std::vector< libcmis::ObjectTypePtr > getChildren( ) { return m_children; }
};
+#undef GetObject
class GetObject : public SoapRequest
{
private:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment