--- sourceforge.net/trunk/rdesktop/rdesktop.h	2001/09/14 03:38:39	29
+++ sourceforge.net/trunk/rdesktop/rdesktop.h	2002/07/29 08:10:11	71
@@ -21,20 +21,24 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <X11/Xlib.h>
 
 #define VERSION "1.1.0"
 
-#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 RDP_DEBUG
-#define DEBUG(args...)  fprintf(stderr, args);
+#if defined(WITH_DEBUG_KBD)
+#define DEBUG_KBD(...)  fprintf(stderr, __VA_ARGS__);
 #else
-#define DEBUG(args...)
+#define DEBUG_KBD(...)
 #endif
 
+#define STRNCPY(dst,src,n) { strncpy(dst,src,n-1); dst[n-1] = 0; }
+
 #include "constants.h"
 #include "types.h"
 #include "parse.h"