mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=12253
This commit is contained in:
parent
09d318b541
commit
a95deb409d
|
@ -2686,3 +2686,12 @@ David 19 Mar 2007
|
||||||
|
|
||||||
lib/
|
lib/
|
||||||
prefs.C
|
prefs.C
|
||||||
|
|
||||||
|
Rom 19 Mar 2007
|
||||||
|
- Add some more cross compiler tweaks to the precompiled header for Windows.
|
||||||
|
|
||||||
|
clientgui/
|
||||||
|
stdwx.h
|
||||||
|
lib/
|
||||||
|
boinc_win.h
|
||||||
|
filesys.C
|
||||||
|
|
|
@ -191,17 +191,28 @@
|
||||||
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
#define vsnprintf _vsnprintf
|
#define vsnprintf _vsnprintf
|
||||||
#define snprintf _snprintf
|
#define snprintf _snprintf
|
||||||
#define fdopen _fdopen
|
#define stprintf _stprintf
|
||||||
#define dup _dup
|
#define stricmp _stricmp
|
||||||
#define unlink _unlink
|
#define strdup _strdup
|
||||||
#define strdup _strdup
|
#define fdopen _fdopen
|
||||||
#define read _read
|
#define dup _dup
|
||||||
#define stat _stat
|
#define unlink _unlink
|
||||||
#define finite _finite
|
#define read _read
|
||||||
|
#define stat _stat
|
||||||
|
#define chdir _chdir
|
||||||
|
#define finite _finite
|
||||||
|
#define strdate _strdate
|
||||||
|
#define strtime _strtime
|
||||||
|
#define getcwd _getcwd
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __GNUC__
|
||||||
|
#define __attribute__(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
// On the Win32 platform include file and line number information for each
|
// On the Win32 platform include file and line number information for each
|
||||||
// memory allocation/deallocation
|
// memory allocation/deallocation
|
||||||
|
|
|
@ -204,8 +204,6 @@ typedef LPCSTR PCTSTR, LPCTSTR, PCUTSTR, LPCUTSTR;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef __CYGWIN__
|
#ifndef __CYGWIN__
|
||||||
|
|
||||||
#define vsnprintf _vsnprintf
|
#define vsnprintf _vsnprintf
|
||||||
|
@ -222,9 +220,14 @@ typedef LPCSTR PCTSTR, LPCTSTR, PCUTSTR, LPCUTSTR;
|
||||||
#define finite _finite
|
#define finite _finite
|
||||||
#define strdate _strdate
|
#define strdate _strdate
|
||||||
#define strtime _strtime
|
#define strtime _strtime
|
||||||
|
#define getcwd _getcwd
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __GNUC__
|
||||||
|
#define __attribute__(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef __MINGW32__
|
#ifdef __MINGW32__
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
|
@ -72,6 +72,7 @@ typedef BOOL (CALLBACK* FreeFn)(LPCTSTR, PULARGE_INTEGER, PULARGE_INTEGER, PULAR
|
||||||
#include "fcgi_stdio.h"
|
#include "fcgi_stdio.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#define RETRY_INTERVAL 5
|
#define RETRY_INTERVAL 5
|
||||||
// On Windows, retry for this period of time, since some other program
|
// On Windows, retry for this period of time, since some other program
|
||||||
// (virus scan, defrag, index) may have the file open.
|
// (virus scan, defrag, index) may have the file open.
|
||||||
|
@ -623,19 +624,11 @@ int FILE_LOCK::unlock(const char* filename) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void boinc_getcwd(char* path) {
|
void boinc_getcwd(char* path) {
|
||||||
#if defined(_WIN32) && !defined(__CYGWIN32__)
|
|
||||||
char* p = _getcwd(path, 256);
|
|
||||||
#else
|
|
||||||
char* p __attribute__ ((unused)) = getcwd(path, 256);
|
char* p __attribute__ ((unused)) = getcwd(path, 256);
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void relative_to_absolute(const char* relname, char* path) {
|
void relative_to_absolute(const char* relname, char* path) {
|
||||||
#if defined(_WIN32) && !defined(__CYGWIN32__)
|
|
||||||
char* p = _getcwd(path, 256);
|
|
||||||
#else
|
|
||||||
char* p __attribute__ ((unused)) = getcwd(path, 256);
|
char* p __attribute__ ((unused)) = getcwd(path, 256);
|
||||||
#endif
|
|
||||||
if (strlen(relname)) {
|
if (strlen(relname)) {
|
||||||
strcat(path, "/");
|
strcat(path, "/");
|
||||||
strcat(path, relname);
|
strcat(path, relname);
|
||||||
|
|
Loading…
Reference in New Issue