diff options
| author | Tobias Kortkamp <t@tobik.me> | 2020-09-03 08:42:18 +0200 |
|---|---|---|
| committer | Tobias Kortkamp <t@tobik.me> | 2020-09-03 08:42:18 +0200 |
| commit | 11ecc65ebb1527e9a83f67bb5ac0dec455cb03e6 (patch) | |
| tree | 81d5bd2a4e07ccf598c2dae571678b8984eeb435 | |
| parent | dace850fa6e27b5626115b366059258cfe4d60c9 (diff) | |
Unbreak with -fno-common on FreeBSD
GCC10 and Clang11 now default to -fno-common.
ld: error: duplicate symbol: jail_errmsg
>>> defined at Platform.c
>>> freebsd/Platform.o:(jail_errmsg)
>>> defined at FreeBSDProcessList.c
>>> freebsd/FreeBSDProcessList.o:(.bss+0x90)
Signed-off-by: Tobias Kortkamp <t@tobik.me>
| -rw-r--r-- | freebsd/FreeBSDProcessList.c | 3 | ||||
| -rw-r--r-- | freebsd/FreeBSDProcessList.h | 14 |
2 files changed, 10 insertions, 7 deletions
diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c index 8c892a02..fd88a563 100644 --- a/freebsd/FreeBSDProcessList.c +++ b/freebsd/FreeBSDProcessList.c @@ -33,7 +33,7 @@ in the source distribution for its full text. #include <sys/resource.h> #define JAIL_ERRMSGLEN 1024 -char jail_errmsg[JAIL_ERRMSGLEN]; +extern char jail_errmsg[JAIL_ERRMSGLEN]; typedef struct CPUData_ { @@ -69,6 +69,7 @@ typedef struct FreeBSDProcessList_ { }*/ +char jail_errmsg[JAIL_ERRMSGLEN]; static int MIB_hw_physmem[2]; static int MIB_vm_stats_vm_v_page_count[4]; diff --git a/freebsd/FreeBSDProcessList.h b/freebsd/FreeBSDProcessList.h index 7c1b7ad4..7bfcf427 100644 --- a/freebsd/FreeBSDProcessList.h +++ b/freebsd/FreeBSDProcessList.h @@ -19,7 +19,7 @@ in the source distribution for its full text. #include <sys/resource.h> #define JAIL_ERRMSGLEN 1024 -char jail_errmsg[JAIL_ERRMSGLEN]; +extern char jail_errmsg[JAIL_ERRMSGLEN]; typedef struct CPUData_ { @@ -54,15 +54,17 @@ typedef struct FreeBSDProcessList_ { } FreeBSDProcessList; +extern char jail_errmsg[JAIL_ERRMSGLEN]; -ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId); -void ProcessList_delete(ProcessList* this); +extern ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId); -char* FreeBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, int* basenameEnd); +extern void ProcessList_delete(ProcessList* this); -char* FreeBSDProcessList_readJailName(struct kinfo_proc* kproc); +extern char* FreeBSDProcessList_readProcessName(kvm_t* kd, struct kinfo_proc* kproc, int* basenameEnd); -void ProcessList_goThroughEntries(ProcessList* this); +extern char* FreeBSDProcessList_readJailName(struct kinfo_proc* kproc); + +extern void ProcessList_goThroughEntries(ProcessList* this); #endif |