Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10185 from jbeich/bsd

Browse source 
Minor BSD fixes
This commit is contained in:
Henrik Rydgård 2017-11-26 23:38:24 +01:00 • committed by GitHub
commit dc3363e885
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Common/FileUtil.cpp
View file

@ -42,9 +42,8 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__)
#include <sys/sysctl.h> // KERN_PROC_PATHNAME #include <sys/sysctl.h> // KERN_PROC_PATHNAME
#include <unistd.h> // getpid
#endif #endif
#if defined(__APPLE__) #if defined(__APPLE__)
@ -767,9 +766,15 @@ const std::string &GetExeDirectory()
#elif defined(KERN_PROC_PATHNAME) #elif defined(KERN_PROC_PATHNAME)
int mib[4] = { int mib[4] = {
CTL_KERN, CTL_KERN,
#if defined(__NetBSD__)
KERN_PROC_ARGS,
-1,
KERN_PROC_PATHNAME,
#else
KERN_PROC, KERN_PROC,
KERN_PROC_PATHNAME, KERN_PROC_PATHNAME,
getpid() -1,
#endif
}; };
size_t sz = program_path_size; size_t sz = program_path_size;

2
Core/Reporting.cpp
View file

@ -269,6 +269,8 @@ namespace Reporting
return "DragonFly"; return "DragonFly";
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
return "FreeBSD"; return "FreeBSD";
#elif defined(__FreeBSD_kernel__) && defined(__GLIBC__)
return "GNU/kFreeBSD";
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
return "NetBSD"; return "NetBSD";
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)