Backport from X.org:

 commit 724dbc2f8bbe2f21bf16f20ca7b8bb555516626c
 Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
 Date:   Tue May 2 01:30:37 2006 +0000

    Use min() [defined in include/misc.h] instead of MIN() [not defined in any
        Xorg header].
Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>