--- configure							2009-02-16 21:52:14.000000000 +0600
+++ configure							2010-07-31 21:12:10.000000000 +0700
@@ -372,9 +372,9 @@
       elif [ $cc_maj -lt 3 \
              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
-             -o \( $cc_maj -eq 4 -a $cc_min -gt 3 \) \
+             -o \( $cc_maj -eq 4 -a $cc_min -gt 5 \) \
              -o $cc_maj -gt 4 ]; then
-        log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<4"
+        log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<5"
         fail really
       else
         log_success "found version $cc_ver"

--- src/recompiler_new/exec.c					2009-02-16 21:54:53.000000000 +0600
+++ src/recompiler_new/exec.c					2010-07-31 21:31:03.000000000 +0700
@@ -2751,7 +2751,7 @@
     int dirty_flags;
 #if defined(VBOX)
     ram_addr = addr;
-#elif
+#else
     ram_addr = addr - (unsigned long)phys_ram_base;
 #endif
 #ifdef VBOX

--- src/VBox/Main/linux/HostHardwareLinux.cpp			2009-02-16 21:54:32.000000000 +0600
+++ src/VBox/Main/linux/HostHardwareLinux.cpp			2010-07-31 21:34:35.000000000 +0700
@@ -34,6 +34,7 @@
 #include <iprt/env.h>
 #include <iprt/mem.h>
 #include <iprt/string.h>
+#include <stdio.h>
 
 #ifdef RT_OS_LINUX
 # include <sys/types.h>

--- src/VBox/Runtime/r0drv/linux/the-linux-kernel.h		2009-02-16 21:54:53.000000000 +0600
+++ src/VBox/Runtime/r0drv/linux/the-linux-kernel.h		2010-07-31 21:20:44.000000000 +0700
@@ -40,6 +40,7 @@
 
 #include <linux/autoconf.h>
 #include <linux/version.h>
+#include <linux/sched.h>
 
 /* We only support 2.4 and 2.6 series kernels */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)

--- src/VBox/Devices/PC/vbox.dsl				2009-02-16 21:53:37.000000000 +0600
+++ src/VBox/Devices/PC/vbox.dsl				2010-07-31 21:25:23.000000000 +0700
@@ -829,7 +829,7 @@
 
                      0xffdfffff,              //  Max = 4GB - 2MB
                      0x00000000,              // Translation
-                     0xdfdfffff,              // Range Length (calculated
+                     0xffe00000,              // Range Length (calculated
                                               // dynamically)
                      ,                        // Optional field left blank
                      ,                        // Optional field left blank

--- src/VBox/Additions/linux/sharedfolders/utils.c		2009-02-16 21:52:55.000000000 +0600
+++ src/VBox/Additions/linux/sharedfolders/utils.c		2010-07-31 22:03:43.000000000 +0700
@@ -25,6 +25,11 @@
 #include <linux/nfs_fs.h>
 #include <linux/vfs.h>
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 31)
+int utf8_mbtowc(wchar_t*pu, const __u8*s, int len){return utf8_to_utf32(s,len,(unicode_t *)pu);}
+int utf8_wctomb(__u8*s, wchar_t u, int maxlen){return utf32_to_utf8((unicode_t)u,s,maxlen);}
+#endif
+
 /* #define USE_VMALLOC */
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 6, 0)

--- src/VBox/Additions/linux/sharedfolders/vfsmod.h		2009-02-16 21:52:55.000000000 +0600
+++ src/VBox/Additions/linux/sharedfolders/vfsmod.h		2010-07-31 22:08:10.000000000 +0700
@@ -108,10 +108,6 @@
 #endif
 int sf_get_volume_info(struct super_block *sb,STRUCT_STATFS *stat);
 
-#ifdef ALIGN
-#undef ALIGN
-#endif
-
 #ifdef __cplusplus
 # define CMC_API __attribute__ ((cdecl, regparm (0)))
 #else