diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 21:13:02 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-27 21:13:02 +0200 |
| commit | baf97f3cc9b8b7f90c2a1bf2fff53f4996b594d2 (patch) | |
| tree | 03c324ebbb1ecb9d6f72ea277a27ac69ad690491 /sal/osl/unx/nlsupport.c | |
| parent | 4430b3f234ad47d7dfe1f3cbce8f2994fe7153db (diff) | |
| parent | 3fb00a59b15233ff5c526ad57cccf54036832c88 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/ure
Conflicts:
sal/osl/unx/nlsupport.c
Diffstat (limited to 'sal/osl/unx/nlsupport.c')
| -rw-r--r-- | sal/osl/unx/nlsupport.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c index 6312cc956392..eb0068269620 100644 --- a/sal/osl/unx/nlsupport.c +++ b/sal/osl/unx/nlsupport.c @@ -32,7 +32,7 @@ #include <rtl/memory.h> #if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \ - defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || \ + defined(FREEBSD) || defined(MACOSX) || defined(IOS) || defined(OPENBSD) || \ defined(DRAGONFLY) #include <pthread.h> #ifndef MACOSX @@ -42,7 +42,7 @@ #include <osl/module.h> #include <osl/thread.h> #endif /* !MACOSX */ -#endif /* LINUX || SOLARIS || NETBSD || MACOSX */ +#endif /* LINUX || SOLARIS || NETBSD || MACOSX || IOS */ #include <string.h> |