mirror of
https://github.com/sockspls/badfish
synced 2025-05-07 03:39:35 +00:00
Drop some redundant defined(_WIN64)
When it is already defined(_WIN32). According to Microsoft documentation: http://msdn.microsoft.com/en-us/library/b0084kay.aspx _WIN32 Defined for applications for Win32 and Win64. Always defined. _WIN64 Defined for applications for Win64. Patch suggested by Joona. No functional change.
This commit is contained in:
parent
37c91aa94c
commit
3b41e62666
2 changed files with 3 additions and 3 deletions
|
@ -178,7 +178,7 @@ void start_logger(bool b) { Logger::start(b); }
|
||||||
|
|
||||||
int cpu_count() {
|
int cpu_count() {
|
||||||
|
|
||||||
#if defined(_WIN32) || defined(_WIN64)
|
#if defined(_WIN32)
|
||||||
SYSTEM_INFO s;
|
SYSTEM_INFO s;
|
||||||
GetSystemInfo(&s);
|
GetSystemInfo(&s);
|
||||||
return s.dwNumberOfProcessors;
|
return s.dwNumberOfProcessors;
|
||||||
|
@ -204,7 +204,7 @@ int cpu_count() {
|
||||||
|
|
||||||
void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
|
void timed_wait(WaitCondition& sleepCond, Lock& sleepLock, int msec) {
|
||||||
|
|
||||||
#if defined(_WIN32) || defined(_WIN64)
|
#if defined(_WIN32)
|
||||||
int tm = msec;
|
int tm = msec;
|
||||||
#else
|
#else
|
||||||
timespec ts, *tm = &ts;
|
timespec ts, *tm = &ts;
|
||||||
|
|
|
@ -43,7 +43,7 @@ typedef unsigned __int64 uint64_t;
|
||||||
# include <unistd.h> // Used by sysconf(_SC_NPROCESSORS_ONLN)
|
# include <unistd.h> // Used by sysconf(_SC_NPROCESSORS_ONLN)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(_WIN32) && !defined(_WIN64) // Linux - Unix
|
#if !defined(_WIN32) // Linux - Unix
|
||||||
|
|
||||||
# include <sys/time.h>
|
# include <sys/time.h>
|
||||||
typedef timeval sys_time_t;
|
typedef timeval sys_time_t;
|
||||||
|
|
Loading…
Add table
Reference in a new issue