From 81a1391ed826014c65ef4f7add659bef1ad7c6fa Mon Sep 17 00:00:00 2001 From: ehofman Date: Sun, 20 Apr 2003 19:42:07 +0000 Subject: [PATCH] MSVC and MingW fixes --- src/MultiPlayer/mpplayer.cxx | 9 ++++++++- src/MultiPlayer/multiplayrxmgr.cxx | 8 +++++++- src/MultiPlayer/multiplaytxmgr.cxx | 10 +++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/MultiPlayer/mpplayer.cxx b/src/MultiPlayer/mpplayer.cxx index d40abec46..adfe19e52 100644 --- a/src/MultiPlayer/mpplayer.cxx +++ b/src/MultiPlayer/mpplayer.cxx @@ -20,6 +20,11 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef FG_MPLAYER_AS /****************************************************************** * $Id$ @@ -38,7 +43,7 @@ #include "mpplayer.hxx" #include -#ifndef _MSC_VER +#if !(defined(_MSC_VER) || defined(__MINGW32__)) # include # include # include @@ -307,3 +312,5 @@ void MPPlayer::FillMsgHdr(T_MsgHdr *MsgHdr, const int iMsgId) { } +#endif // FG_MPLAYER_AS + diff --git a/src/MultiPlayer/multiplayrxmgr.cxx b/src/MultiPlayer/multiplayrxmgr.cxx index 00322bdb2..33f5f1aa6 100644 --- a/src/MultiPlayer/multiplayrxmgr.cxx +++ b/src/MultiPlayer/multiplayrxmgr.cxx @@ -21,6 +21,11 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef FG_MPLAYER_AS /****************************************************************** * $Id$ @@ -51,7 +56,7 @@ ******************************************************************/ #include -#ifndef _MSC_VER +#if !(defined(_MSC_VER) || defined(__MINGW32__)) # include # include # include @@ -353,4 +358,5 @@ void FGMultiplayRxMgr::Update(void) { } +#endif // FG_MPLAYER_AS diff --git a/src/MultiPlayer/multiplaytxmgr.cxx b/src/MultiPlayer/multiplaytxmgr.cxx index 9373a09bb..4ec000602 100644 --- a/src/MultiPlayer/multiplaytxmgr.cxx +++ b/src/MultiPlayer/multiplaytxmgr.cxx @@ -21,6 +21,12 @@ // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. // +#ifdef HAVE_CONFIG_H +#include +#endif + +#ifdef FG_MPLAYER_AS + /****************************************************************** * $Id$ * @@ -31,7 +37,7 @@ ******************************************************************/ #include -#ifndef _MSC_VER +#if !(defined(_MSC_VER) || defined(__MINGW32__)) # include # include # include @@ -235,3 +241,5 @@ void FGMultiplayTxMgr::SendTextMessage(const string &sMsgText) const { } +#endif // FG_MPLAYER_AS +