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

Define WIN32_LEAN_AND_MEAN to make using Winsock2 possible (for vncsrv and slirp).

Browse Source 
TODO: change include statements to winsock2.h and link with ws2_32.dll.
This commit is contained in:
Volker Ruppert 2014-02-15 00:23:36 +00:00
parent 12ce16285c
commit cf93269380
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bochs/bochs.h
View File

@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001-2013 The Bochs Project
// Copyright (C) 2001-2014 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
@ -38,6 +38,7 @@ extern "C" {
// In a win32 compile (including cygwin), windows.h is required for several
// files in gui and iodev. It is important to include it here in a header
// file so that WIN32-specific data types can be used in fields of classes.
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif

4
bochs/gui/win32_enh_dbg_osdep.cc
View File

@ -8,7 +8,7 @@
//
// Modified by Bruce Ewing
//
// Copyright (C) 2008-2013 The Bochs Project
// Copyright (C) 2008-2014 The Bochs Project
#include "config.h"
@ -24,8 +24,8 @@
// to use the "A" functions instead of the "W" functions. That is, strcpyA(), sprintfA(), etc.
// This will require setting macros for the non-os-specific code, too.
#include <windows.h>
#include <commctrl.h>
#include <commdlg.h>
#ifdef _WIN64
#define DWL_MSGRESULT DWLP_MSGRESULT

3
bochs/iodev/gameport.cc
View File

@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2003-2009 The Bochs Project
// Copyright (C) 2003-2014 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
@ -40,6 +40,7 @@
#elif defined(WIN32)
#include <mmsystem.h>
#ifndef JOY_BUTTON1
#define JOY_BUTTON1 1
#define JOY_BUTTON2 2

4
bochs/iodev/sound/soundwin.h
View File

@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2001-2011 The Bochs Project
// Copyright (C) 2001-2014 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
@ -23,7 +23,7 @@
#if defined(WIN32)
#include <windows.h>
#include <mmsystem.h>
// uncomment one of the following two #defines
//#define usesndPlaySnd