lib: some changes to help building the WIN32 library with MinGW/gcc

enable by defining MINGW_WIN32 macro, nothing should change if
this is not set

svn path=/trunk/boinc/; revision=19280
This commit is contained in:
Bernd Machenschalk 2009-10-07 19:17:52 +00:00
parent 2905b7fed9
commit 3f38b286d3
4 changed files with 26 additions and 0 deletions

View File

@ -8498,3 +8498,12 @@ Rom 7 Oct 2009
ViewProjectsGrid.cpp, .h (deleted)
ViewTransfersGrid.cpp, .h (deleted)
ViewWorkGrid.cpp, .h (deleted)
Bernd 7 Oct 2009
- lib: some changes to help building the WIN32 library with MinGW/gcc
enable by defining MINGW_WIN32 macro, nothing should change if
this is not set
lib/
boinc_win.h
diagnostics.h
filesys.cpp

View File

@ -96,7 +96,11 @@ typedef size_t socklen_t;
#include <commctrl.h>
#include <raserror.h>
#if defined(MINGW_WIN32)
#include <imagehlp.h>
#else
#include <dbghelp.h>
#endif
#include <tlhelp32.h>
#include <io.h>
@ -129,7 +133,9 @@ typedef LPCSTR PCTSTR, LPCTSTR, PCUTSTR, LPCUTSTR;
// C headers
#include <sys/stat.h>
#include <sys/types.h>
#if !defined(MINGW_WIN32)
#include <fcntl.h>
#endif
#include <malloc.h>
#if !defined(__MINGW32__) && !defined(__CYGWIN32__)
@ -211,9 +217,11 @@ extern "C" {
#endif
void __cdecl _fpreset (void);
void __cdecl fpreset (void);
#ifndef MINGW_WIN32
#define SetClassLongPtr SetClassLong
#define GCLP_HICON GCL_HICON
#define GCLP_HICONSM GCL_HICONSM
#endif
#ifdef __cplusplus
}
#endif

View File

@ -114,7 +114,12 @@ extern int diagnostics_finish_unhandled_exception_monitor();
#ifdef _WIN32
extern UINT WINAPI diagnostics_unhandled_exception_monitor(LPVOID lpParameter);
extern LONG CALLBACK boinc_catch_signal(EXCEPTION_POINTERS *ExceptionInfo);
#ifndef MINGW_WIN32
extern void boinc_catch_signal_invalid_parameter(const wchar_t* expression, const wchar_t* function, const wchar_t* file, unsigned int line, uintptr_t pReserved);
#else
extern void boinc_catch_signal_invalid_parameter(const wchar_t* expression, const wchar_t* function, const wchar_t* file, unsigned int line);
#endif
#else
extern void boinc_catch_signal(int signal);
extern void boinc_set_signal_handler(int sig, void(*handler)(int));

View File

@ -23,6 +23,10 @@
#define getcwd _getcwd
#endif
#if defined(MINGW_WIN32)
#include <fcntl.h>
#endif
#if !defined(_WIN32) || defined(__CYGWIN32__)
#include "config.h"
#ifdef _USING_FCGI_