From f2e57d9fec6332eb7837c58b42f211ed754b0e45 Mon Sep 17 00:00:00 2001
From: Benoit Dejean <bdejean@gmail.com>
Date: Sat, 18 Jul 2015 22:10:05 +0200
Subject: 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.
---
 src/daemon/server.c | 28 ----------------------------
 1 file changed, 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>
 
-- 
cgit v1.2.1