citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

common: some FreeBSD headers are incomplete to avoid namespace pollution 

In file included from src/common/x64/cpu_detect.cpp:16:
/usr/include/machine/cpufunc.h:66:17: error: unknown type name 'u_int'
static __inline u_int
                ^
/usr/include/machine/cpufunc.h:67:6: error: unknown type name 'u_int'
bsfl(u_int mask)
     ^
/usr/include/machine/cpufunc.h:69:2: error: unknown type name 'u_int'
        u_int   result;
        ^
/usr/include/machine/cpufunc.h:75:17: error: unknown type name 'u_long'; did you mean 'long'?
static __inline u_long
                ^
/usr/include/machine/cpufunc.h:76:6: error: unknown type name 'u_long'; did you mean 'long'?
bsfq(u_long mask)
     ^
/usr/include/machine/cpufunc.h:78:2: error: use of undeclared identifier 'u_long'; did you mean
      'long'?
        u_long  result;
        ^
[...]
This commit is contained in:
Jan Beich 2016-10-10 03:26:27 +00:00
parent 26af2b644c
commit 3d801be97d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/x64/cpu_detect.cpp
View File

@ -13,8 +13,10 @@ namespace Common {
#ifndef _MSC_VER #ifndef _MSC_VER
#ifdef __FreeBSD__ #ifdef __FreeBSD__
#include <machine/cpufunc.h> // clang-format off
#include <sys/types.h> #include <sys/types.h>
#include <machine/cpufunc.h>
// clang-format on
#endif #endif
static inline void __cpuidex(int info[4], int function_id, int subfunction_id) { static inline void __cpuidex(int info[4], int function_id, int subfunction_id) {