incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1296429 - in /incubator/ooo/trunk/main: scp2/source/ooo/file_library_ooo.scp ucb/source/ucp/webdav/AprEnv.hxx ucb/source/ucp/webdav/SerfUri.hxx
Date Fri, 02 Mar 2012 20:07:34 GMT
Author: ydario
Date: Fri Mar  2 20:07:34 2012
New Revision: 1296429

URL: http://svn.apache.org/viewvc?rev=1296429&view=rev
Log:
i118923 - OS/2 port: use system libraries for apr, apr-util, serf.

Modified:
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/AprEnv.hxx
    incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1296429&r1=1296428&r2=1296429&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Fri Mar  2 20:07:34 2012
@@ -1998,6 +1998,8 @@ End
 #endif
 #endif
 
+#if !defined(OS2) // using system libs
+
 File gid_File_Lib_Apr
      #ifdef WNT
         Name = SPECIAL_NAME(libapr-1);
@@ -2043,3 +2045,4 @@ File gid_File_Lib_Serf
     PACKED_LIB_FILE_BODY;
 End
 
+#endif // !defined(OS2)

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/AprEnv.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/AprEnv.hxx?rev=1296429&r1=1296428&r2=1296429&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/AprEnv.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/AprEnv.hxx Fri Mar  2 20:07:34 2012
@@ -23,7 +23,11 @@
 #ifndef INCLUDED_APRENV_HXX
 #define INCLUDED_APRENV_HXX
 
+#ifdef OS2 // use system apr headers
+#include <apr_pools.h>
+#else
 #include <apr/apr_pools.h>
+#endif
 
 namespace apr_environment
 {

Modified: incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx?rev=1296429&r1=1296428&r2=1296429&view=diff
==============================================================================
--- incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx (original)
+++ incubator/ooo/trunk/main/ucb/source/ucp/webdav/SerfUri.hxx Fri Mar  2 20:07:34 2012
@@ -23,7 +23,11 @@
 #ifndef INCLUDED_SERFURI_HXX
 #define INCLUDED_SERFURI_HXX
 
+#ifdef OS2 // use system apr headers
+#include <apr_uri.h>
+#else
 #include <apr-util/apr_uri.h>
+#endif
 #include <rtl/ustring.hxx>
 #include <DAVException.hxx>
 



Mime
View raw message