*** VirtualBox-1.6.0_OSE.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c	Tue May 13 21:21:36 2008
--- VirtualBox-1.6.0_OSE/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c	Tue May 13 21:54:12 2008
***************
*** 32,35 ****
--- 32,36 ----
  #include <sys/ddi_intr.h>
  #include <sys/sunddi.h>
+ #include <sys/open.h>
  #undef u /* /usr/include/sys/user.h:249:1 is where this is defined to (curproc->p_user). very cool. */
  
*** VirtualBox-1.6.0_OSE.orig/src/VBox/Additions/x11/xmouse/Makefile.kmk	Tue May 13 21:21:36 2008
--- VirtualBox-1.6.0_OSE/src/VBox/Additions/x11/xmouse/Makefile.kmk	Tue May 13 21:47:00 2008
***************
*** 106,109 ****
--- 106,110 ----
  	$(VBOX_PATH_X11_XORG_1_4)/X11 \
  	$(VBOX_PATH_X11_XORG_1_4)/xorg \
+ 	$(VBOX_PATH_X11_XORG_7_0) \
  	$(PATH_SUB_CURRENT)
  vboxmouse_drv_14_SOURCES = \
*** VirtualBox-1.6.0_OSE.orig/src/VBox/Additions/x11/xclient/seamless-x11.h	Tue May 13 21:21:35 2008
--- VirtualBox-1.6.0_OSE/src/VBox/Additions/x11/xclient/seamless-x11.h	Tue May 13 21:52:32 2008
***************
*** 29,32 ****
--- 29,33 ----
  
  #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
  #include <X11/extensions/shape.h>
  
*** VirtualBox-1.6.0_OSE.orig/src/VBox/Additions/x11/xgraphics/Makefile.kmk	Tue May 13 21:21:36 2008
--- VirtualBox-1.6.0_OSE/src/VBox/Additions/x11/xgraphics/Makefile.kmk	Tue May 13 21:46:27 2008
***************
*** 159,163 ****
  	$(VBOX_PATH_X11_XORG_1_3) \
  	$(VBOX_PATH_X11_XORG_1_3)/X11 \
! 	$(VBOX_PATH_X11_XORG_1_3)/xorg
  vboxvideo_drv_13_SOURCES = \
  	vboxvideo_13.c \
--- 159,164 ----
  	$(VBOX_PATH_X11_XORG_1_3) \
  	$(VBOX_PATH_X11_XORG_1_3)/X11 \
! 	$(VBOX_PATH_X11_XORG_1_3)/xorg \
! 	$(VBOX_PATH_X11_XORG_7_0)
  vboxvideo_drv_13_SOURCES = \
  	vboxvideo_13.c \
***************
*** 178,182 ****
  	$(VBOX_PATH_X11_XORG_1_4) \
  	$(VBOX_PATH_X11_XORG_1_4)/X11 \
! 	$(VBOX_PATH_X11_XORG_1_4)/xorg
  vboxvideo_drv_14_SOURCES  = \
  	vboxvideo_13.c \
--- 179,184 ----
  	$(VBOX_PATH_X11_XORG_1_4) \
  	$(VBOX_PATH_X11_XORG_1_4)/X11 \
! 	$(VBOX_PATH_X11_XORG_1_4)/xorg \
! 	$(VBOX_PATH_X11_XORG_7_0)
  vboxvideo_drv_14_SOURCES  = \
  	vboxvideo_13.c \
*** VirtualBox-1.6.0_OSE.orig/src/VBox/Devices/Makefile.kmk	Tue May 13 21:21:34 2008
--- VirtualBox-1.6.0_OSE/src/VBox/Devices/Makefile.kmk	Tue May 13 21:32:45 2008
***************
*** 174,178 ****
  endif
  ifeq ($(BUILD_TARGET),solaris)
!  VBoxDD_LIBS           += adm
   ifdef VBOX_WITH_CROSSBOW
    VBoxDD_LIBS          += dlpi
--- 174,178 ----
  endif
  ifeq ($(BUILD_TARGET),solaris)
!  VBoxDD_LIBS           += adm resolv
   ifdef VBOX_WITH_CROSSBOW
    VBoxDD_LIBS          += dlpi
*** VirtualBox-1.6.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/HappyHttp.cpp	Tue May 13 21:21:40 2008
--- VirtualBox-1.6.0_OSE/src/VBox/Frontends/VirtualBox/src/HappyHttp.cpp	Tue May 13 22:02:32 2008
***************
*** 68,71 ****
--- 68,76 ----
  #endif
  
+ /* undefined on Solaris 10 */
+ #ifndef INADDR_NONE
+ # define INADDR_NONE ((unsigned long) -1)
+ #endif
+ 
  #include <cstdio>
  #include <cstring>
*** VirtualBox-1.6.0_OSE.orig/Config.kmk	Tue May 13 21:21:44 2008
--- VirtualBox-1.6.0_OSE/Config.kmk	Tue May 13 21:31:39 2008
***************
*** 278,283 ****
  IPRT_WITH_KSTUFF = 1
  endif
! # Enable Crossbow support for Solaris.
! VBOX_WITH_CROSSBOW = 1
  # Enable setuid wrapper for Solaris.
  #VBOX_WITH_SUID_WRAPPER = 1
--- 278,283 ----
  IPRT_WITH_KSTUFF = 1
  endif
! # Disable Crossbow support for Solaris 10.
! VBOX_WITH_CROSSBOW =
  # Enable setuid wrapper for Solaris.
  #VBOX_WITH_SUID_WRAPPER = 1
*** VirtualBox-1.6.0_OSE.orig/configure	Tue May 13 21:21:25 2008
--- VirtualBox-1.6.0_OSE/configure	Tue May 13 21:24:31 2008
***************
*** 60,65 ****
  LIBCRYPTO="-lcrypto"
  LIBPTHREAD="-lpthread"
! LIBX11="-L/usr/X11R6/lib -L/usr/X11R6/lib64 -L/usr/local/lib -lXext -lX11"
! INCX11="/usr/local/include"
  LIBXCURSOR="-lXcursor"
  INCZ=""
--- 60,65 ----
  LIBCRYPTO="-lcrypto"
  LIBPTHREAD="-lpthread"
! LIBX11="-L/tmp/build/lib -L/usr/openwin/lib -L/usr/X11R6/lib -lXext -lX11"
! INCX11="-I/tmp/build/include -I/usr/openwin/include -I/usr/X11R6/include"
  LIBXCURSOR="-lXcursor"
  INCZ=""
***************
*** 67,71 ****
  INCPNG=""
  LIBPNG="-lpng"
! QT3DIR="/usr/qt/3 /usr/lib/qt3 /usr/lib/qt-3.3 /usr/share/qt3 /usr/lib64/qt-3.3 /usr/X11R6 /usr/lib/qt"
  QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr"
  QT4UIC3DIR="/usr/bin"
--- 67,71 ----
  INCPNG=""
  LIBPNG="-lpng"
! QT3DIR="/tmp/build"
  QT4DIR="/usr/lib/qt4 /usr/share/qt4 /usr"
  QT4UIC3DIR="/usr/bin"
***************
*** 987,992 ****
      cat > .tmp_src.cc << EOF
  #include <cstdio>
! #include <SDL.h>
! #include <SDL_main.h>
  #undef main
  extern "C" int main(int argc, char** argv)
--- 987,992 ----
      cat > .tmp_src.cc << EOF
  #include <cstdio>
! #include <SDL/SDL.h>
! #include <SDL/SDL_main.h>
  #undef main
  extern "C" int main(int argc, char** argv)
*** VirtualBox-1.6.0_OSE.orig/src/VBox/Additions/solaris/Makefile.kmk	Tue May 13 21:21:36 2008
--- VirtualBox-1.6.0_OSE/src/VBox/Additions/solaris/Makefile.kmk	Tue May 13 21:33:34 2008
***************
*** 29,33 ****
  
  ifeq ($(BUILD_PLATFORM),solaris)
!  include $(PATH_SUB_CURRENT)/SharedFolders/Makefile.kmk
  endif
  
--- 29,34 ----
  
  ifeq ($(BUILD_PLATFORM),solaris)
! # SharedFolders does not exist in 1.6
! # include $(PATH_SUB_CURRENT)/SharedFolders/Makefile.kmk
  endif