--- sourceforge.net/trunk/rdesktop/rdesktop.h	2003/10/29 06:31:30	525
+++ sourceforge.net/trunk/rdesktop/rdesktop.h	2004/03/04 08:23:17	626
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Master include file
-   Copyright (C) Matthew Chapman 1999-2002
+   Copyright (C) Matthew Chapman 1999-2004
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,8 +21,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <dirent.h>
 
-#define VERSION "1.3.0"
+#define VERSION "1.3.1"
 
 #ifdef WITH_DEBUG
 #define DEBUG(args)	printf args;
@@ -49,7 +50,14 @@
 #endif
 
 #define STRNCPY(dst,src,n)	{ strncpy(dst,src,n-1); dst[n-1] = 0; }
+
+#ifndef MIN
 #define MIN(x,y)		(((x) < (y)) ? (x) : (y))
+#endif
+
+#ifndef MAX
+#define MAX(x,y)		(((x) > (y)) ? (x) : (y))
+#endif
 
 #include "parse.h"
 #include "constants.h"