diff options
| author | Luboš Luňák <l.lunak@suse.cz> | 2012-09-17 15:00:42 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2012-09-17 15:00:49 +0200 |
| commit | e3b2030ca395ec8c2d09b35b381b67c3c76da5e5 (patch) | |
| tree | 44ebc34f838f939b8e3c1706eef382157968355f /libcmis | |
| parent | 7a182026fce922a9f69e8da76d46e87e7188a4e9 (diff) | |
libcmis: fixed some conflict with windows.h definitions
Change-Id: I5f121cbeff3f0cda5776d5361e585eaa1b48ea63
Diffstat (limited to 'libcmis')
| -rw-r--r-- | libcmis/UnpackedTarball_cmis.mk | 1 | ||||
| -rw-r--r-- | libcmis/libcmis-0.3.0-win.patch | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/libcmis/UnpackedTarball_cmis.mk b/libcmis/UnpackedTarball_cmis.mk index caf29ab93579..8739aa74fc5e 100644 --- a/libcmis/UnpackedTarball_cmis.mk +++ b/libcmis/UnpackedTarball_cmis.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,cmis,0)) $(eval $(call gb_UnpackedTarball_add_patches,cmis, \ libcmis/libcmis-0.3.0-warnings.patch \ + libcmis/libcmis-0.3.0-win.patch \ )) ifeq ($(OS)$(COM),WNTMSC) diff --git a/libcmis/libcmis-0.3.0-win.patch b/libcmis/libcmis-0.3.0-win.patch new file mode 100644 index 000000000000..e9110d286023 --- /dev/null +++ b/libcmis/libcmis-0.3.0-win.patch @@ -0,0 +1,25 @@ +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: |