Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5984

Browse Source 
7fdaa82 Fix build on FreeBSD/!x86 (pkubaj)
0f4fddc Add also ifdef __x86_64__ (pkubaj)
This commit is contained in:
luigi1111 2019-10-16 13:53:14 -05:00
commit 6c05723981
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptonote_basic/miner.cpp
View File

@ -62,7 +62,9 @@
#include <devstat.h> #include <devstat.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#if defined(__amd64__) || defined(__i386__) || defined(__x86_64__)
#include <machine/apm_bios.h> #include <machine/apm_bios.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
@ -1086,6 +1088,7 @@ namespace cryptonote
return boost::logic::tribool(boost::logic::indeterminate); return boost::logic::tribool(boost::logic::indeterminate);
} }
#if defined(__amd64__) || defined(__i386__) || defined(__x86_64__)
apm_info info; apm_info info;
if( ioctl(fd, APMIO_GETINFO, &info) == -1 ) { if( ioctl(fd, APMIO_GETINFO, &info) == -1 ) {
close(fd); close(fd);
@ -1126,6 +1129,7 @@ namespace cryptonote
LOG_ERROR("sysctlbyname(\"hw.acpi.acline\") output is unexpectedly " LOG_ERROR("sysctlbyname(\"hw.acpi.acline\") output is unexpectedly "
<< n << " bytes instead of the expected " << sizeof(ac) << " bytes."); << n << " bytes instead of the expected " << sizeof(ac) << " bytes.");
return boost::logic::tribool(boost::logic::indeterminate); return boost::logic::tribool(boost::logic::indeterminate);
#endif
} }
return boost::logic::tribool(ac == 0); return boost::logic::tribool(ac == 0);
#endif #endif