From 8d4643367948a6df2b80d35b8df62c36f3c52961 Mon Sep 17 00:00:00 2001
From: Stanislav Shwartsman <sshwarts@users.sourceforge.net>
Date: Mon, 1 Nov 2010 14:50:18 +0000
Subject: [PATCH] compilation fixes for mingw64 gcc

---
 bochs/configure    | 6 +++---
 bochs/configure.in | 4 ++--
 bochs/osdep.h      | 6 +++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bochs/configure b/bochs/configure
index bb666b48b..6075c2203 100755
--- a/bochs/configure
+++ b/bochs/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in,v 1.438 2010/04/29 19:22:02 sshwarts Exp .
+# From configure.in Id: configure.in,v 1.439 2010/05/12 14:55:11 sshwarts Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.65.
 #
@@ -25127,8 +25127,8 @@ $as_echo "no" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long mode 1G pages support" >&5
-$as_echo_n "checking for long mode 1G pages support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long mode 1G pages support (deprecated)" >&5
+$as_echo_n "checking for long mode 1G pages support (deprecated)... " >&6; }
 # Check whether --enable-1g-pages was given.
 if test "${enable_1g_pages+set}" = set; then :
   enableval=$enable_1g_pages; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
diff --git a/bochs/configure.in b/bochs/configure.in
index 5152cdd46..58900e5ed 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
 AC_INIT(bochs.h)
-AC_REVISION([[$Id: configure.in,v 1.439 2010-05-12 14:55:11 sshwarts Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.440 2010-11-01 14:50:18 sshwarts Exp $]])
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADER(ltdlconf.h)
 
@@ -2701,7 +2701,7 @@ AC_ARG_ENABLE(ignore-bad-msr,
    AC_MSG_RESULT(no)
   ])
 
-AC_MSG_CHECKING(for long mode 1G pages support)
+AC_MSG_CHECKING(for long mode 1G pages support (deprecated))
 AC_ARG_ENABLE(1g-pages,
   [  --enable-1g-pages                 support for 1G pages in long mode (deprecated)],
   [AC_MSG_RESULT($enableval)
diff --git a/bochs/osdep.h b/bochs/osdep.h
index b3fd32f19..30b90042e 100644
--- a/bochs/osdep.h
+++ b/bochs/osdep.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: osdep.h,v 1.36 2009-12-04 20:02:12 sshwarts Exp $
+// $Id: osdep.h,v 1.37 2010-11-01 14:50:18 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2001-2009  The Bochs Project
@@ -62,8 +62,12 @@ extern "C" {
 #endif
 
 // always return regular file.
+#ifndef S_ISREG
 #  define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
+#endif
+#ifndef S_ISCHR
 #  define S_ISCHR(m)      (((m) & S_IFMT) == S_IFCHR)
+#endif
 
 // win32 has snprintf though with different name.
 #define snprintf _snprintf