--- sourceforge.net/trunk/rdesktop/rdesktop.h	2000/10/16 08:44:48	21
+++ sourceforge.net/trunk/rdesktop/rdesktop.h	2004/01/21 14:40:40	569
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Master include file
-   Copyright (C) Matthew Chapman 1999-2000
+   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
@@ -18,25 +18,49 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
-#define VERSION "1.0.0"
+#define VERSION "1.3.1"
 
-#define STATUS(args...) fprintf(stderr, args);
-#define ERROR(args...)  fprintf(stderr, "ERROR: "args);
-#define WARN(args...)   fprintf(stderr, "WARNING: "args);
-#define NOTIMP(args...) fprintf(stderr, "NOTIMP: "args);
+#ifdef WITH_DEBUG
+#define DEBUG(args)	printf args;
+#else
+#define DEBUG(args)
+#endif
+
+#ifdef WITH_DEBUG_KBD
+#define DEBUG_KBD(args) printf args;
+#else
+#define DEBUG_KBD(args)
+#endif
+
+#ifdef WITH_DEBUG_RDP5
+#define DEBUG_RDP5(args) printf args;
+#else
+#define DEBUG_RDP5(args)
+#endif
 
-#ifdef RDP_DEBUG
-#define DEBUG(args...)  fprintf(stderr, args);
+#ifdef WITH_DEBUG_CLIPBOARD
+#define DEBUG_CLIPBOARD(args) printf args;
 #else
-#define DEBUG(args...)
+#define DEBUG_CLIPBOARD(args)
 #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"
 #include "types.h"
-#include "parse.h"
 
 #ifndef MAKE_PROTO
 #include "proto.h"