[Libreoffice] .: sot/Library_sot.mk

[Michael Stahl]

On 21/12/11 16:16, Caolán McNamara wrote:
>  sot/Library_sot.mk |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> New commits:
> commit 56c0d3b569ba62eafe94f79299e5afb83f2f891b
> Author: Caolán McNamara <caolanm at redhat.com>
> Date:   Wed Dec 21 15:16:26 2011 +0000
> 
>     disable min as macro under msvc

wonder if it would make sense to define NOMINMAX globally in windows.mk
(presumably MinGW also carries this disease for compatibility?), should
be easier than finding out which libraries use std::min etc. by hand and
less clutter?

> diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
> index cc5271d..1c008a1 100644
> --- a/sot/Library_sot.mk
> +++ b/sot/Library_sot.mk
> @@ -42,7 +42,7 @@ $(eval $(call gb_Library_add_api,sot,\
>  ))
>  
>  $(eval $(call gb_Library_add_defs,sot,\
> -    -DSOT_DLLIMPLEMENTATION \
> +    -DSOT_DLLIMPLEMENTATION -DNOMINMAX\
>  ))
>  
>  $(eval $(call gb_Library_add_linked_libs,sot,\