mirror of https://github.com/BOINC/boinc.git
Fix compile errors on Windows
svn path=/trunk/boinc/; revision=13807
This commit is contained in:
parent
1845d8f2a3
commit
772fd84afc
|
@ -17,10 +17,13 @@
|
||||||
// or write to the Free Software Foundation, Inc.,
|
// or write to the Free Software Foundation, Inc.,
|
||||||
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <grp.h>
|
#include <grp.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "error_numbers.h"
|
#include "error_numbers.h"
|
||||||
#include "file_names.h"
|
#include "file_names.h"
|
||||||
|
@ -33,7 +36,8 @@
|
||||||
|
|
||||||
bool g_use_sandbox = false;
|
bool g_use_sandbox = false;
|
||||||
|
|
||||||
#if (!defined(_WIN32) && !defined(_DEBUG))
|
#ifndef _WIN32
|
||||||
|
#ifndef _DEBUG
|
||||||
static int lookup_group(char* name, gid_t& gid) {
|
static int lookup_group(char* name, gid_t& gid) {
|
||||||
struct group* gp = getgrnam(name);
|
struct group* gp = getgrnam(name);
|
||||||
if (!gp) return ERR_GETGRNAM;
|
if (!gp) return ERR_GETGRNAM;
|
||||||
|
@ -119,6 +123,8 @@ int remove_project_owned_file_or_dir(const char* path) {
|
||||||
return ERR_UNLINK;
|
return ERR_UNLINK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // ! _WIN32
|
||||||
|
|
||||||
static int delete_project_owned_file_aux(const char* path) {
|
static int delete_project_owned_file_aux(const char* path) {
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
if (DeleteFile(path)) return 0;
|
if (DeleteFile(path)) return 0;
|
||||||
|
@ -168,10 +174,12 @@ int clean_out_dir(const char* dirpath) {
|
||||||
|
|
||||||
dirp = dir_open(dirpath);
|
dirp = dir_open(dirpath);
|
||||||
if (!dirp) {
|
if (!dirp) {
|
||||||
|
#ifndef _WIN32
|
||||||
if (g_use_sandbox && (errno == EACCES)) {
|
if (g_use_sandbox && (errno == EACCES)) {
|
||||||
// dir may be owned by boinc_apps
|
// dir may be owned by boinc_apps
|
||||||
return remove_project_owned_file_or_dir(dirpath);
|
return remove_project_owned_file_or_dir(dirpath);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
return 0; // if dir doesn't exist, it's empty
|
return 0; // if dir doesn't exist, it's empty
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue