[Libreoffice-commits] .: 3 commits - i18npool/prj tools/source

[Tor Lillqvist]

 i18npool/prj/d.lst              |    1 +
 tools/source/fsys/unx.cxx       |    4 ++--
 tools/source/stream/strmunx.cxx |    3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 907f01de66149e06e5309a57136ea2193e86ff85
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jun 15 17:59:53 2011 +0300

    It's called EDEADLK on iOS, too

diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 8fc841c..7c5130d 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -226,7 +226,8 @@ static sal_uInt32 GetSvError( int nErrno )
         { EBADF,        SVSTREAM_INVALID_HANDLE },
 #if defined(RS6000) || defined(ALPHA) || defined(NETBSD) || \
     defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || \
-    defined(__FreeBSD_kernel__) || defined (AIX) || defined(DRAGONFLY)
+    defined(__FreeBSD_kernel__) || defined (AIX) || defined(DRAGONFLY) || \
+    defined(IOS)
         { EDEADLK,      SVSTREAM_LOCKING_VIOLATION },
 #else
         { EDEADLOCK,    SVSTREAM_LOCKING_VIOLATION },
commit 549ce474dfff512b0d7b3f71aea6ee57a8903965
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jun 15 17:57:49 2011 +0300

    Don't bother with any mount table handling on iOS either

diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index a05e984..acb834a 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.cxx
@@ -44,7 +44,7 @@ extern "C" int mntctl( int cmd, size_t size, char* buf );
 #elif defined(NETBSD)
 #include <sys/mount.h>
 #elif defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || \
-      defined(DRAGONFLY)
+      defined(DRAGONFLY) || defined(IOS)
 struct mnttab
 {
   char *mnt_dir;
@@ -85,7 +85,7 @@ struct mymnttab
 
 
 #if defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) || \
-    defined(OPENBSD) || defined(DRAGONFLY)
+    defined(OPENBSD) || defined(DRAGONFLY) || defined(IOS)
 sal_Bool GetMountEntry(dev_t /* dev */, struct mymnttab * /* mytab */ )
 {
     DBG_WARNING( "Sorry, not implemented: GetMountEntry" );
commit a82f6f22468dc9260f7298426af4218be9ae55ce
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jun 15 17:36:59 2011 +0300

    Deliver also static i18nisolang library if built such (as for iOS)

diff --git a/i18npool/prj/d.lst b/i18npool/prj/d.lst
index 71e0ae3..91df3e8 100644
--- a/i18npool/prj/d.lst
+++ b/i18npool/prj/d.lst
@@ -40,6 +40,7 @@ mkdir: %_DEST%\inc\i18npool
 ..\%__SRC%\bin\i18nisol*.dll %_DEST%\bin\i18nisol*.dll
 ..\%__SRC%\lib\libi18nisolang*.so %_DEST%\lib\libi18nisolang*.so
 ..\%__SRC%\lib\libi18nisolang*.dylib %_DEST%\lib\libi18nisolang*.dylib
+..\%__SRC%\lib\libi18nisolang*.a %_DEST%\lib\libi18nisolang*.a
 
 ..\%__SRC%\lib\ii18npaper*.lib %_DEST%\lib\ii18npaper*.lib
 ..\%__SRC%\bin\i18npaper*.dll %_DEST%\bin\i18npaper*.dll