mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

right fix for msvcpp problem

Browse Source
This commit is contained in:
Stanislav Shwartsman 2009-10-02 16:11:06 +00:00
parent d9f701ddb0
commit d1dff34997
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bochs/configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Id: configure.in,v 1.409 2009/08/10 08:08:25 sshwarts Exp .
# From configure.in Id: configure.in,v 1.410 2009/08/10 15:44:49 sshwarts Exp .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
@ -37536,7 +37536,7 @@ _ACEOF
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define BX_HAVE_STRICMP 0
#define BX_HAVE_STRICMP 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
@ -37549,6 +37549,14 @@ _ACEOF
cat >>confdefs.h <<\_ACEOF
#define BX_HAVE_STRTOUQ 0
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define BX_HAVE_STRREV 1
_ACEOF
cat >>confdefs.h <<\_ACEOF
#define BX_HAVE_STRDUP 1
_ACEOF
cat >>confdefs.h <<\_ACEOF

6
bochs/configure.in
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.410 2009-08-10 15:44:49 sshwarts Exp $]])
AC_REVISION([[$Id: configure.in,v 1.411 2009-10-02 16:11:06 sshwarts Exp $]])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_HEADER(ltdlconf.h)
@ -2507,10 +2507,12 @@ case "$target" in
AC_DEFINE(BX_64BIT_CONSTANTS_USE_LL, 0)
AC_DEFINE(inline, __forceinline)
AC_DEFINE(BX_NO_ATTRIBUTES, 1)
AC_DEFINE(BX_HAVE_STRICMP, 0)
AC_DEFINE(BX_HAVE_STRICMP, 1)
AC_DEFINE(BX_HAVE_STRCASECMP, 0)
AC_DEFINE(BX_HAVE_STRTOULL, 0)
AC_DEFINE(BX_HAVE_STRTOUQ, 0)
AC_DEFINE(BX_HAVE_STRREV, 1)
AC_DEFINE(BX_HAVE_STRDUP, 1)
AC_DEFINE(HAVE_LIBREADLINE, 0)
AC_DEFINE(BX_HAVE_GETTIMEOFDAY, 0)
AC_DEFINE(BX_HAVE_DLFCN_H, 0)

12
bochs/osdep.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: osdep.h,v 1.34 2009-10-02 15:28:42 akrisak Exp $
// $Id: osdep.h,v 1.35 2009-10-02 16:11:06 sshwarts Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001 MandrakeSoft S.A.
@ -91,8 +91,7 @@ extern "C" {
#define unlink _unlink
#define strdup _strdup
#define strrev _strrev
#undef BX_HAVE_STRREV
#define BX_HAVE_STRREV 1
#define stricmp _stricmp
#define getch _getch
#endif
@ -171,12 +170,7 @@ extern "C" {
extern char *bx_strrev(char *str);
#endif
#if defined(_MSC_VER)
// MSDEV is a special case because configure script don't handle it
#ifndef stricmp
#define stricmp _stricmp
#endif
#elif BX_HAVE_STRICMP
#if BX_HAVE_STRICMP
// great, just use the usual function
#elif BX_HAVE_STRCASECMP
#define stricmp strcasecmp