mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=611
This commit is contained in:
parent
7c734e5d49
commit
4646eb40d3
|
@ -360,10 +360,6 @@ double boinc_cpu_time() {
|
|||
#endif // _WIN32
|
||||
#endif
|
||||
|
||||
#ifdef macintosh
|
||||
return (double) GetCPUTime() / CLOCKS_PER_SEC;
|
||||
#endif
|
||||
|
||||
fprintf(stderr, "boinc_cpu_time(): not implemented\n");
|
||||
}
|
||||
|
||||
|
|
|
@ -61,11 +61,7 @@
|
|||
#include "log_flags.h"
|
||||
#include "net_xfer.h"
|
||||
|
||||
// On Macs, socklen_t isn't defined in a header file so we have to define it here
|
||||
#ifdef mac
|
||||
#define socklen_t unsigned int
|
||||
#endif
|
||||
// The other option is that the socket functions require size_t instead
|
||||
// If socklen_t isn't defined, define it here as size_t
|
||||
#if !defined(socklen_t)
|
||||
#define socklen_t size_t
|
||||
#endif
|
||||
|
|
|
@ -20,16 +20,7 @@
|
|||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
#ifdef macintosh
|
||||
#include "seti_mac.h"
|
||||
#else
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
#ifdef MAC_OS_X
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#endif
|
||||
|
||||
#include <time.h>
|
||||
#include <string.h>
|
||||
|
@ -83,9 +74,6 @@ DIRREF dir_open(char* p) {
|
|||
strcpy(dirp->path, p);
|
||||
strcat(dirp->path, "\\*");
|
||||
dirp->handle = INVALID_HANDLE_VALUE;
|
||||
#endif
|
||||
#ifdef macintosh
|
||||
SayErr("\pdir_open called (empty function)"); /* CAF Temp */
|
||||
#endif
|
||||
return dirp;
|
||||
}
|
||||
|
@ -131,10 +119,6 @@ int dir_scan(char* p, DIRREF dirp) {
|
|||
}
|
||||
}
|
||||
#endif
|
||||
#ifdef macintosh
|
||||
SayErr("\pdir_scan called (empty function)"); /* CAF Temp */
|
||||
return 1;
|
||||
#endif
|
||||
}
|
||||
|
||||
// Close a directory
|
||||
|
@ -152,9 +136,6 @@ void dir_close(DIRREF dirp) {
|
|||
}
|
||||
free(dirp);
|
||||
#endif
|
||||
#ifdef macintosh
|
||||
SayErr("\pdir_close called (empty function)"); /* CAF Temp */
|
||||
#endif
|
||||
}
|
||||
|
||||
// Delete the file located at path
|
||||
|
|
|
@ -201,7 +201,7 @@
|
|||
INSTALL_PATH = "$(HOME)/Applications";
|
||||
LIBRARY_SEARCH_PATHS = "";
|
||||
OPTIMIZATION_CFLAGS = "-O0";
|
||||
OTHER_CFLAGS = "-DHOSTTYPE=\\\\\\\"MacOSX\\\\\\\" -DHOST=\\\\\\\"MacOSX\\\\\\\" -DVERSION=1 -Dmac -DHAVE_SYS_SOCKET_H -DHAVE_SYS_RESOURCE_H -DHAVE_NETDB_H -DHAVE_UNISTD_H -DHAVE_SYS_WAIT_H -DHAVE_NETINET_IN_H -DHAVE_SIGNAL_H -DHAVE_ARPA_INET_H -DHAVE_SYS_TIME_H -DHAVE_SYS_TYPES_H -DHAVE_DIRENT_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H -DHAVE_SYS_SYSCTL_H -DHAVE_SYS_MOUNT_H -DHAVE_SYS_VMMETER_H";
|
||||
OTHER_CFLAGS = "-DHOSTTYPE=\\\\\\\"MacOSX\\\\\\\" -DHOST=\\\\\\\"MacOSX\\\\\\\" -DVERSION=1 -DHAVE_SYS_SOCKET_H -DHAVE_SYS_RESOURCE_H -DHAVE_NETDB_H -DHAVE_UNISTD_H -DHAVE_SYS_WAIT_H -DHAVE_NETINET_IN_H -DHAVE_SIGNAL_H -DHAVE_ARPA_INET_H -DHAVE_SYS_TIME_H -DHAVE_SYS_TYPES_H -DHAVE_DIRENT_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H -DHAVE_SYS_SYSCTL_H -DHAVE_SYS_MOUNT_H -DHAVE_SYS_VMMETER_H";
|
||||
OTHER_LDFLAGS = "";
|
||||
OTHER_REZFLAGS = "";
|
||||
PRODUCT_NAME = BOINC;
|
||||
|
@ -1627,7 +1627,7 @@
|
|||
F54FF8A7029F2FAA012012A7,
|
||||
);
|
||||
buildSettings = {
|
||||
OTHER_CFLAGS = "-Dunix -Dmac -DHAVE_DIRENT_H";
|
||||
OTHER_CFLAGS = "-DHAVE_DIRENT_H -DHAVE_SYS_TIME_H -DHAVE_SYS_RESOURCE_H";
|
||||
OTHER_LDFLAGS = "";
|
||||
OTHER_REZFLAGS = "";
|
||||
PRODUCT_NAME = concat;
|
||||
|
@ -1796,7 +1796,7 @@
|
|||
);
|
||||
buildSettings = {
|
||||
LIBRARY_SEARCH_PATHS = /usr/lib/gcc/darwin/3.1;
|
||||
OTHER_CFLAGS = "-Dunix -Dmac -DHAVE_DIRENT_H -DHAVE_SYS_RESOURCE_H -DHAVE_UNISTD_H -DHAVE_SIGNAL_H -DHAVE_SYS_TIME_H -DBOINC_APP_GRAPHICS";
|
||||
OTHER_CFLAGS = "-DHAVE_DIRENT_H -DHAVE_SYS_RESOURCE_H -DHAVE_UNISTD_H -DHAVE_SIGNAL_H -DHAVE_SYS_TIME_H -DBOINC_APP_GRAPHICS";
|
||||
OTHER_LDFLAGS = "";
|
||||
OTHER_REZFLAGS = "";
|
||||
PRODUCT_NAME = upper_case;
|
||||
|
|
Loading…
Reference in New Issue