Branch: Tag:

2014-12-04

2014-12-04 19:23:45 by Henrik Grubbström (Grubba) <grubba@grubba.org>

[portability] Replaced use of MIN/MAX with macros MINIMUM/MAXIMUM.

The macros MIN and MAX are apparently available on Linux, but not
on Solaris 10.

533:    * pike_string_cpy(MKPCHARP_STR_OFF(dsts,tmp), srcs);    * does bad stuff    */ -  dsts = new_realloc_shared_string( dsts, tmp+srcs->len, MAX(srcs->size_shift,dsts->size_shift) ); +  dsts = new_realloc_shared_string( dsts, tmp+srcs->len, MAXIMUM(srcs->size_shift,dsts->size_shift) );    update_flags_for_add( dsts, srcs );    generic_memcpy(MKPCHARP_STR_OFF(dsts,tmp), MKPCHARP_STR(srcs), tmp2);    dst->u.string = low_end_shared_string( dsts );