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>
main
Tobias Kortkamp 6 years ago
parent dace850fa6
commit 11ecc65ebb
No known key found for this signature in database
GPG Key ID: F4815C5F893E655D
  1. 3
      freebsd/FreeBSDProcessList.c
  2. 14
      freebsd/FreeBSDProcessList.h

@ -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];

@ -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

Loading…
Cancel
Save