--- sourceforge.net/trunk/rdesktop/rdesktop.h	2000/08/15 10:23:24	10
+++ sourceforge.net/trunk/rdesktop/rdesktop.h	2002/07/18 18:28:12	66
@@ -18,22 +18,27 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <X11/Xlib.h>
 
-#define VERSION "0.9.0-alpha1"
+#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(args...)  fprintf(stderr, args);
 #else
-#define DEBUG(args...)
+#define DEBUG_KBD(args...)
 #endif
 
+#define STRNCPY(dst,src,n) { strncpy(dst,src,n-1); dst[n-1] = 0; }
+
 #include "constants.h"
 #include "types.h"
 #include "parse.h"