diff options
| author | Rex Dieter <rdieter@math.unl.edu> | 2016-02-18 08:29:07 -0600 |
|---|---|---|
| committer | Rex Dieter <rdieter@math.unl.edu> | 2016-04-18 15:17:22 -0500 |
| commit | 53cc1fa18a3b96d2c31a145d971017564fca39bb (patch) | |
| tree | 573b0f5e508e117e26715fec156f4b8fb5c44638 /rfb | |
| parent | 5b322f523faa437d8e7d03736bdb1714e8f84ce5 (diff) | |
| download | libtdevnc-53cc1fa18a3b96d2c31a145d971017564fca39bb.tar.gz libtdevnc-53cc1fa18a3b96d2c31a145d971017564fca39bb.zip | |
use namespaced rfbMax macro (issue #102)
Not using generic 'max', avoids conflicts with stl_algobase.h
Diffstat (limited to 'rfb')
| -rw-r--r-- | rfb/rfbproto.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rfb/rfbproto.h b/rfb/rfbproto.h index 8e607e5..bb6bfa5 100644 --- a/rfb/rfbproto.h +++ b/rfb/rfbproto.h @@ -93,8 +93,8 @@ #define strncasecmp _strnicmp #endif +#define rfbMax(a,b) (((a)>(b))?(a):(b)) #if !defined(WIN32) || defined(__MINGW32__) -#define max(a,b) (((a)>(b))?(a):(b)) #ifdef LIBVNCSERVER_HAVE_SYS_TIME_H #include <sys/time.h> #endif |