Win compile fixes

svn path=/trunk/boinc/; revision=25937
This commit is contained in:
David Anderson 2012-08-01 21:02:54 +00:00
parent 405f567c81
commit 2e71ade9c5
8 changed files with 17 additions and 12 deletions

View File

@ -65,6 +65,10 @@
#include <vector>
#include <string>
#ifdef _WIN32
#include "boinc_win.h"
#endif
#ifdef _USING_FCGI_
#include "boinc_fcgi.h"
#endif

View File

@ -18,6 +18,8 @@
#ifndef _BOINC_DIAGNOSTICS_WIN_
#define _BOINC_DIAGNOSTICS_WIN_
#include "boinc_win.h"
#define NT_SUCCESS(Status) ((NTSTATUS)(Status) >= 0)
#define STATUS_INFO_LENGTH_MISMATCH ((NTSTATUS)0xC0000004L)
#define SystemProcessAndThreadInformation 5

View File

@ -29,17 +29,16 @@
#include <string>
#endif
#define FILE_RETRY_INTERVAL 5
// On Windows, retry for this period of time, since some other program
// (virus scan, defrag, index) may have the file open.
#ifndef MAXPATHLEN
#define MAXPATHLEN 1024
#endif
#endif /* !WIN32 */
#define FILE_RETRY_INTERVAL 5
// On Windows, retry for this period of time, since some other program
// (virus scan, defrag, index) may have the file open.
#ifdef __cplusplus
extern "C" {
#endif

View File

@ -18,12 +18,13 @@
// This file is the underlying mechanism of GUI RPC client
// (not the actual RPCs)
#include "gui_rpc_client.h"
#if defined(_WIN32) && !defined(__STDWX_H__) && !defined(_BOINC_WIN_) && !defined(_AFX_STDAFX_H_)
#include "boinc_win.h"
#endif
#include "gui_rpc_client.h"
#ifdef _WIN32
#include "../version.h"
#ifdef _MSC_VER

View File

@ -41,12 +41,13 @@
// formatting failures for any software that has been localized or
// displays localized data.
#include "gui_rpc_client.h"
#if defined(_WIN32) && !defined(__STDWX_H__) && !defined(_BOINC_WIN_) && !defined(_AFX_STDAFX_H_)
#include "boinc_win.h"
#endif
#include "gui_rpc_client.h"
#ifdef _WIN32
#include "../version.h"
#else

View File

@ -22,9 +22,7 @@
#include "boinc_fcgi.h"
#endif
#ifndef _WIN32
#include <string>
#endif
#include "mfile.h"

View File

@ -18,8 +18,8 @@
#ifndef _PROXY_INFO_
#define _PROXY_INFO_
struct XML_PARSER;
struct MIOFILE;
class XML_PARSER;
class MIOFILE;
// info on whether HTTP requests need to go through a proxy
//

View File

@ -802,7 +802,7 @@ bool is_remote_desktop() {
static tWTSFM pWTSFM = NULL;
LPTSTR pBuf = NULL;
DWORD dwLength;
USHORT usProtocol=-1, usConnectionState=-1;
USHORT usProtocol=99, usConnectionState=99;
if (!wtsapi32lib) {
wtsapi32lib = LoadLibrary(_T("wtsapi32.dll"));