--- sourceforge.net/trunk/rdesktop/rdesktop.h	2004/08/24 21:37:50	756
+++ sourceforge.net/trunk/rdesktop/rdesktop.h	2005/03/13 08:10:30	854
@@ -1,7 +1,7 @@
 /*
    rdesktop: A Remote Desktop Protocol client.
    Master include file
-   Copyright (C) Matthew Chapman 1999-2004
+   Copyright (C) Matthew Chapman 1999-2005
    
    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
@@ -22,9 +22,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>
+#include <sys/time.h>
+#ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
+#else
+#include <sys/types.h>
+#include <unistd.h>
+#endif
 
-#define VERSION "1.3.1"
+#define VERSION "1.4.0"
 
 #ifdef WITH_DEBUG
 #define DEBUG(args)	printf args;
@@ -72,6 +78,14 @@
 #endif
 #endif /* B_ENDIAN, L_ENDIAN from configure */
 
+/* No need for alignment on x86 and amd64 */
+#if !defined(NEED_ALIGN)
+#if !(defined(__x86__) || defined(__x86_64__) || \
+      defined(__AMD64__) || defined(_M_IX86))
+#define NEED_ALIGN
+#endif
+#endif
+
 #include "parse.h"
 #include "constants.h"
 #include "types.h"