[Libreoffice-commits] core.git: i18npool/Executable_saxparser.mk

Stephan Bergmann sbergman at redhat.com
Thu Feb 6 23:44:33 PST 2014


 i18npool/Executable_saxparser.mk |   17 -----------------
 1 file changed, 17 deletions(-)

New commits:
commit 375f98d615e7dad8d26d394a95bb46a3a7cf3f0f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Feb 7 08:43:57 2014 +0100

    Remove obsolete workaround
    
    Change-Id: I8c8e99036fe694a2fb0160250c7c0c4fefb98a3e

diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk
index 1eafa51..0938af4 100644
--- a/i18npool/Executable_saxparser.mk
+++ b/i18npool/Executable_saxparser.mk
@@ -24,21 +24,4 @@ $(eval $(call gb_Executable_add_exception_objects,saxparser,\
 	i18npool/source/localedata/saxparser \
 ))
 
-ifeq ($(OS),SOLARIS)
-# the xmlparser build breaks in this header file
-#
-#      /opt/SUNWspro/WS6U1/include/CC/Cstd/./limits
-#
-# which defines a class with member functions called min() and max().
-# the build breaks because in solar.h, there is something like this
-#
-#      #define max(x,y) ((x) < (y) ? (y) : (x))
-#      #define min(x,y) ((x) < (y) ? (x) : (y))
-#
-# so the only choice is to prevent "CC/Cstd/./limits" from being included:
-$(eval $(call gb_Executable_add_defs,saxparser,\
-	-D__STD_LIMITS \
-))
-endif
-
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list