basic/source/classes/sbxmod.cxx | 2 +-
external/python3/UnpackedTarball_python3.mk | 1 -
external/python3/python-3.3.0-i42553.patch.2 | 18 ------------------
solenv/gbuild/platform/solaris.mk | 4 +++-
4 files changed, 4 insertions(+), 21 deletions(-)
New commits:
commit 12b865c02877b1b1f33b0866602d3e556c899974
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Feb 8 12:56:00 2017 +0100
gbuild, python3: stop defining SOLARIS, and remove SOLARIS patch
It's faster to change our code not to rely on -DSOLARIS than to
wait for python developers to remove such nonsense from their public
headers.
Change-Id: I3ab05d41bbb51b91a2add599339ce334b5099330
diff --git a/external/python3/UnpackedTarball_python3.mk
b/external/python3/UnpackedTarball_python3.mk
index f84b982..915416f 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -21,7 +21,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/python-3.3.0-darwin.patch.1 \
external/python3/python-3.3.0-ssl.patch.1 \
external/python3/python-3.3.0-msvc-disable.patch.1 \
- external/python3/python-3.3.0-i42553.patch.2 \
external/python3/python-3.3.0-pythreadstate.patch.1 \
external/python3/python-3.3.0-clang.patch.1 \
external/python3/python-3.3.5-pyexpat-symbols.patch.1 \
diff --git a/external/python3/python-3.3.0-i42553.patch.2
b/external/python3/python-3.3.0-i42553.patch.2
deleted file mode 100644
index 2114522..0000000
--- a/external/python3/python-3.3.0-i42553.patch.2
+++ /dev/null
@@ -1,18 +0,0 @@
-definition of gethostbyname conflicts with system /usr/include/unistd.h,
-available since at least Solaris 2.6 according to python-Bugs-837046
-Author: tanigu...@openoffice.org
-
---- misc/Python-2.6.1/Include/pyport.h 2008-06-11 09:41:16.000000000 +0200
-+++ misc/build/Python-2.6.1/Include/pyport.h 2011-06-06 17:31:17.000000000
+0200
-@@ -449,11 +449,6 @@
- in platform-specific #ifdefs.
- **************************************************************************/
-
--#ifdef SOLARIS
--/* Unchecked */
--extern int gethostname(char *, int);
--#endif
--
- #ifdef HAVE__GETPTY
- #include <sys/types.h> /* we need to import mode_t */
- extern char * _getpty(int *, int, mode_t, int);
diff --git a/solenv/gbuild/platform/solaris.mk
b/solenv/gbuild/platform/solaris.mk
index de98363..f20ebb9 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -25,8 +25,10 @@ ifneq ($(origin AR),default)
gb_AR := $(AR)
endif
+# do not define SOLARIS - use #ifdef __sun instead
+# -D$(OS) \
+
gb_OSDEFS := \
- -D$(OS) \
-DSYSV \
-DSUN \
-DSUN4 \
commit 2e0e05aa3c1ba35608bc4f0f8a6718cca3e414b9
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Feb 8 12:54:04 2017 +0100
basic: another SOLARIS check here converted to __sun
Change-Id: Iec76b096cfcab4bd45b77bdb1438776bf5de69ca
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index c9c7b73..8976a89 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1097,7 +1097,7 @@ void SbModule::Run( SbMethod* pMeth )
// Empiric value, 900 = needed bytes/Basic call level
// for Linux including 10% safety margin
nMaxCallLevel = rl.rlim_cur / 900;
-#elif defined SOLARIS
+#elif defined __sun
// Empiric value, 1650 = needed bytes/Basic call level
// for Solaris including 10% safety margin
nMaxCallLevel = rl.rlim_cur / 1650;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
