[Libreoffice-commits] .: 2 commits - sal/inc sal/osl

[Tor Lillqvist]

 sal/inc/sal/mathconf.h |    2 ++
 sal/osl/unx/system.h   |   33 ++++++++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit 08b91ed65cfcf428555bdc5994f349bf2049c120
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue May 24 03:28:49 2011 +0300

    Add iOS

diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 59a6117..9ff6cc4 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -333,11 +333,42 @@ int macxp_resolveAlias(char *path, int buflen);
 #endif
 #endif
 
+#ifdef IOS
+#	ifndef ETIME
+#		define  ETIME ETIMEDOUT
+#	endif
+#	include <pthread.h>
+#	include <sys/file.h>
+#	include <sys/ioctl.h>
+#	include <sys/uio.h>
+#	include <sys/un.h>
+#	include <netinet/tcp.h>
+#	include <machine/endian.h>
+#	include <sys/time.h>
+#	include <sys/semaphore.h>
+#	if BYTE_ORDER == LITTLE_ENDIAN
+#		ifndef _LITTLE_ENDIAN
+#		define _LITTLE_ENDIAN
+#		endif
+#	elif BYTE_ORDER == BIG_ENDIAN
+#		ifndef _BIG_ENDIAN
+#		define _BIG_ENDIAN
+#		endif
+#	elif BYTE_ORDER == PDP_ENDIAN
+#		ifndef _PDP_ENDIAN
+#		define _PDP_ENDIAN
+#		endif
+#	endif
+#	define 	IOCHANNEL_TRANSFER_BSD_RENO
+#	define  NO_PTHREAD_RTL
+#endif
+
 #if !defined(_WIN32)  && \
     !defined(LINUX)   && !defined(NETBSD) && !defined(FREEBSD) && \
     !defined(AIX)     && \
     !defined(SOLARIS) && !defined(MACOSX) && \
-    !defined(OPENBSD) && !defined(DRAGONFLY)
+    !defined(OPENBSD) && !defined(DRAGONFLY) && \
+    !defined(IOS) && !defined(ANDROID)
 #	error "Target platform not specified!"
 #endif
 
commit 3c9379635906ab90e583741268349f8c7a0a672e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue May 24 03:25:43 2011 +0300

    Use isfinite() on iOS
    
    We probably should use isfinite() on more platforms, at least other
    BSD-based ones, instead of the allegedly deprecated finite()?

diff --git a/sal/inc/sal/mathconf.h b/sal/inc/sal/mathconf.h
index ef6fc51..6b20f50 100644
--- a/sal/inc/sal/mathconf.h
+++ b/sal/inc/sal/mathconf.h
@@ -61,6 +61,8 @@ extern "C" {
 /* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
 #if defined( WNT)
 #define SAL_MATH_FINITE(d) _finite(d)
+#elif defined IOS
+#define SAL_MATH_FINITE(d) isfinite(d)
 #elif defined LINUX || defined UNX
 #define SAL_MATH_FINITE(d) finite(d)
 #else /* WNT, LINUX, UNX */