compilation fixes for mingw64 gcc

This commit is contained in:
Stanislav Shwartsman 2010-11-01 14:50:18 +00:00
parent 024c0073fc
commit 8d46433679
3 changed files with 10 additions and 6 deletions

6
bochs/configure vendored
View File

@ -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

View File

@ -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)

View File

@ -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