Author: ydario
Date: Sat Dec 2 12:08:07 2017
New Revision: 1816943
URL: http://svn.apache.org/viewvc?rev=1816943&view=rev
Log:
#i126518# build ooofilereader library using zlib/minizip system headers on OS/2.
Modified:
openoffice/trunk/main/shell/inc/internal/types.hxx
openoffice/trunk/main/shell/inc/internal/zipfile.hxx
openoffice/trunk/main/shell/prj/build.lst
Modified: openoffice/trunk/main/shell/inc/internal/types.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/shell/inc/internal/types.hxx?rev=1816943&r1=1816942&r2=1816943&view=diff
==============================================================================
--- openoffice/trunk/main/shell/inc/internal/types.hxx (original)
+++ openoffice/trunk/main/shell/inc/internal/types.hxx Sat Dec 2 12:08:07 2017
@@ -29,8 +29,13 @@
#include <utility>
#include <vector>
#include <stack>
+#ifdef OS2
+#include <zlib.h>
+#include <minizip/ioapi.h>
+#else
#include <external/zlib/zlib.h>
#include <external/zlib/ioapi.h>
+#endif
typedef std::vector<std::wstring> StringList_t;
Modified: openoffice/trunk/main/shell/inc/internal/zipfile.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/shell/inc/internal/zipfile.hxx?rev=1816943&r1=1816942&r2=1816943&view=diff
==============================================================================
--- openoffice/trunk/main/shell/inc/internal/zipfile.hxx (original)
+++ openoffice/trunk/main/shell/inc/internal/zipfile.hxx Sat Dec 2 12:08:07
2017
@@ -29,7 +29,11 @@
#endif
+#ifdef OS2
+#include <minizip/unzip.h>
+#else
#include <external/zlib/unzip.h>
+#endif
#include <string>
Modified: openoffice/trunk/main/shell/prj/build.lst
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/shell/prj/build.lst?rev=1816943&r1=1816942&r2=1816943&view=diff
==============================================================================
--- openoffice/trunk/main/shell/prj/build.lst (original)
+++ openoffice/trunk/main/shell/prj/build.lst Sat Dec 2 12:08:07 2017
@@ -13,7 +13,9 @@ sl shell\source\unix\sysshell
sl shell\source\tools\lngconvex nmake - w
sl_win32_lngconv sl_inc NULL
sl shell\source\tools\regsvrex nmake - w
sl_win32_regsvrex sl_inc NULL
sl shell\source\all\zipfile nmake - w
sl_all_zipfile sl_inc NULL
+sl shell\source\all\zipfile nmake - p
sl_all_zipfile sl_inc NULL
sl shell\source\all\ooofilereader nmake - w
sl_all_ooofilereader sl_all_zipfile.w sl_all sl_inc NULL
+sl shell\source\all\ooofilereader nmake - p
sl_all_ooofilereader sl_all_zipfile.p sl_all sl_inc NULL
sl shell\source\win32\shlxthandler\res nmake - w
sl_win32_shlxthandler_res sl_win32_lngconv.w sl_inc NULL
sl shell\source\win32\shlxthandler\util nmake - w
sl_win32_shlxthandler_util sl_inc NULL
sl shell\source\win32\shlxthandler\propsheets nmake - w
sl_win32_shlxthandler_propsheets sl_inc NULL
