fixes and code format

This commit is contained in:
van Hauser 2020-12-07 14:36:04 +01:00
parent 4c2e375e22
commit e6de85861c
2 changed files with 8 additions and 11 deletions

View File

@ -80,8 +80,8 @@ wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
apt-get update && apt-get upgrade -y
apt-get install -y clang-12 clang-tools-12 libc++1-12 libc++-12-dev \
libc++abi1-12 libc++abi-12-dev libclang1-12 libclang-12-dev \
libclang-common-12-dev libclang-cpp11 libclang-cpp11-dev liblld-12 \
liblld-12-dev liblldb-12 liblldb-12-dev libllvm11 libomp-12-dev \
libclang-common-12-dev libclang-cpp12 libclang-cpp12-dev liblld-12 \
liblld-12-dev liblldb-12 liblldb-12-dev libllvm12 libomp-12-dev \
libomp5-12 lld-12 lldb-12 llvm-12 llvm-12-dev llvm-12-runtime llvm-12-tools
```

View File

@ -192,25 +192,21 @@ static u8 *find_object(u8 *obj, u8 *argv0) {
}
#if \
defined(__FreeBSD__) \
|| defined(__DragonFly__) \
|| defined(__linux__) \
|| defined(__ANDROID__) \
|| defined(__NetBSD__)
#define HAS_PROC_FS 1
#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__linux__) || \
defined(__ANDROID__) || defined(__NetBSD__)
#define HAS_PROC_FS 1
#endif
#ifdef HAS_PROC_FS
else {
char *procname = NULL;
#if defined(__FreeBSD__) || defined(__DragonFly__)
#if defined(__FreeBSD__) || defined(__DragonFly__)
procname = "/proc/curproc/file";
#elif defined(__linux__) || defined(__ANDROID__)
procname = "/proc/self/exe";
#elif defined(__NetBSD__)
procname = "/proc/curproc/exe";
#endif
#endif
if (procname) {
char exepath[PATH_MAX];
@ -251,6 +247,7 @@ static u8 *find_object(u8 *obj, u8 *argv0) {
}
}
#endif
#undef HAS_PROC_FS