*** ./iodev/eth_vde.cc.ORIG	Thu Oct  6 10:59:05 2011
--- ./iodev/eth_vde.cc	Thu Oct  6 10:59:19 2011
***************
*** 222,228 ****
  
    if (fd<0) return;
    //nbytes = read (fd, buf, sizeof(buf));
!   nbytes=recvfrom(fddata,buf,sizeof(buf),MSG_DONTWAIT|MSG_WAITALL,(struct sockaddr *) &datain, &datainsize);
  
    rxbuf=buf;
  
--- 222,228 ----
  
    if (fd<0) return;
    //nbytes = read (fd, buf, sizeof(buf));
!   nbytes=recvfrom(fddata,buf,sizeof(buf),MSG_NONBLOCK|MSG_WAITALL,(struct sockaddr *) &datain, &datainsize);
  
    rxbuf=buf;
  
*** ./configure.ORIG	Thu Oct  6 10:57:45 2011
--- ./configure	Thu Oct  6 10:58:36 2011
***************
*** 24943,24949 ****
  
  	# More AIX lossage: must compile with cc_r
  	# Extract the first word of "cc_r", so it can be a program name with args.
! set dummy cc_r; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :
--- 24943,24949 ----
  
  	# More AIX lossage: must compile with cc_r
  	# Extract the first word of "cc_r", so it can be a program name with args.
! set dummy xlc_r; ac_word=$2
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
  $as_echo_n "checking for $ac_word... " >&6; }
  if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :
***************
*** 24959,24965 ****
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
!     ac_cv_prog_PTHREAD_CC="cc_r"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
--- 24959,24965 ----
    test -z "$as_dir" && as_dir=.
      for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
!     ac_cv_prog_PTHREAD_CC="xlc_r"
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
*** ./iodev/eth_slirp.cc.ORIG	Thu Feb 23 16:34:02 2012
--- ./iodev/eth_slirp.cc	Thu Feb 23 16:36:50 2012
***************
*** 31,40 ****
--- 31,43 ----
  #include <stdio.h>
  #include <unistd.h>
  #include <stdlib.h>
+ #include <strings.h>
  #include <sys/types.h>
  #include <sys/socket.h>
  #include <sys/wait.h>
+ #ifndef _AIX51
  #include <stdint.h>
+ #endif
  #include <arpa/inet.h> /* ntohs, htons */
  
  #define LOG_THIS netdev->
*** ./misc/bximage.c.ORIG	Tue Jul 10 23:24:17 2012
--- ./misc/bximage.c	Wed Jul 11 08:35:57 2012
***************
*** 24,29 ****
--- 24,30 ----
  #include <string.h>
  
  #include "../osdep.h"
+ #include "bswap.h"
  
  #define HDIMAGE_HEADERS_ONLY 1
  #include "../iodev/hdimage.h"
*** ./misc/bswap.h.ORIG	Wed Jul 11 08:36:42 2012
--- ./misc/bswap.h	Wed Jul 11 08:36:35 2012
***************
*** 0 ****
--- 1,46 ----
+ /////////////////////////////////////////////////////////////////////////
+ // $Id: bswap.h 10933 2012-01-04 19:34:08Z vruppert $
+ /////////////////////////////////////////////////////////////////////////
+ //
+ //  Copyright (C) 2012  The Bochs Project
+ //
+ //  This library is free software; you can redistribute it and/or
+ //  modify it under the terms of the GNU Lesser General Public
+ //  License as published by the Free Software Foundation; either
+ //  version 2 of the License, or (at your option) any later version.
+ //
+ //  This library is distributed in the hope that it will be useful,
+ //  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ //  Lesser General Public License for more details.
+ //
+ //  You should have received a copy of the GNU Lesser General Public
+ //  License along with this library; if not, write to the Free Software
+ //  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ /////////////////////////////////////////////////////////////////////////
+ 
+ #ifndef BX_BSWAP_H
+ #define BX_BSAPP_H
+ 
+ #if BX_HAVE___BUILTIN_BSWAP32
+ #define bx_bswap32 __builtin_bswap32
+ #else
+ BX_CPP_INLINE Bit32u bx_bswap32(Bit32u val32)
+ {
+   val32 = ((val32<<8) & 0xFF00FF00) | ((val32>>8) & 0x00FF00FF);
+   return (val32<<16) | (val32>>16);
+ }
+ #endif
+ 
+ #if BX_HAVE___BUILTIN_BSWAP64
+ #define bx_bswap64 __builtin_bswap64
+ #else
+ BX_CPP_INLINE Bit64u bx_bswap64(Bit64u val64)
+ {
+   Bit32u lo = bx_bswap32((Bit32u)(val64 >> 32));
+   Bit32u hi = bx_bswap32((Bit32u)(val64 & 0xFFFFFFFF));
+   return ((Bit64u)hi << 32) | (Bit64u)lo;
+ }
+ #endif
+ 
+ #endif
*** ./misc/bxcommit.c.ORIG	Wed Jul 11 08:37:26 2012
--- ./misc/bxcommit.c	Wed Jul 11 08:37:46 2012
***************
*** 44,49 ****
--- 44,50 ----
  #endif  /* !BX_HAVE_SNPRINTF */
  
  #include "../osdep.h"
+ #include "bswap.h"
  
  #define HDIMAGE_HEADERS_ONLY 1
  #include "../iodev/hdimage.h"