summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Dejean <bdejean@gmail.com>2015-07-18 22:10:05 +0200
committerBenoit Dejean <bdejean@gmail.com>2015-07-18 22:10:05 +0200
commitf2e57d9fec6332eb7837c58b42f211ed754b0e45 (patch)
tree57dc42a7a00d6c4f7d488e8f4c4b26b4f7230cd5
parent14818230859f11f12d0568f5c171413949414191 (diff)
downloadlibgtop-f2e57d9fec6332eb7837c58b42f211ed754b0e45.tar.gz
Don't define twice glibtop_global_server and server_features.
I don't know how the linker was even able to cope with that. This is somehow related with previous commit: 4808aac Make libgtop_server2 link against its libgtop.
-rw-r--r--src/daemon/server.c28
1 files changed, 0 insertions, 28 deletions
diff --git a/src/daemon/server.c b/src/daemon/server.c
index 92ff0784..44b7f618 100644
--- a/src/daemon/server.c
+++ b/src/daemon/server.c
@@ -22,40 +22,12 @@
#include <config.h>
#include "daemon.h"
-static glibtop _glibtop_global_server;
-glibtop *glibtop_global_server = &_glibtop_global_server;
-
#include <glibtop.h>
#include <glibtop/union.h>
#include <glibtop/sysdeps.h>
#include <sys/utsname.h>
-const unsigned long glibtop_server_features =
-GLIBTOP_SUID_CPU +
-GLIBTOP_SUID_MEM +
-GLIBTOP_SUID_SWAP +
-GLIBTOP_SUID_UPTIME +
-GLIBTOP_SUID_LOADAVG +
-GLIBTOP_SUID_SHM_LIMITS +
-GLIBTOP_SUID_MSG_LIMITS +
-GLIBTOP_SUID_SEM_LIMITS +
-GLIBTOP_SUID_PROCLIST +
-GLIBTOP_SUID_PROC_STATE +
-GLIBTOP_SUID_PROC_UID +
-GLIBTOP_SUID_PROC_MEM +
-GLIBTOP_SUID_PROC_TIME +
-GLIBTOP_SUID_PROC_SIGNAL +
-GLIBTOP_SUID_PROC_KERNEL +
-GLIBTOP_SUID_PROC_SEGMENT +
-GLIBTOP_SUID_PROC_ARGS +
-GLIBTOP_SUID_PROC_MAP +
-GLIBTOP_SUID_NETLOAD +
-GLIBTOP_SUID_NETLIST +
-GLIBTOP_SUID_PROC_WD +
-GLIBTOP_SUID_PROC_AFFINITY +
-GLIBTOP_SUID_PPP;
-
#include <fcntl.h>
#include <locale.h>