From bae16b467f90df94d80feae41dceb7e816f16c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Perell=C3=B3=20Mar=C3=ADn?= <carlos@gnome.org>
Date: Sun, 19 Oct 2003 16:10:39 +0000
Subject: libgtop-GNOME-2-0-branch moved to HEAD.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2003-10-19  Carlos Perelló Marín <carlos@gnome.org>

	* libgtop-GNOME-2-0-branch moved to HEAD.
---
 include/glibtop/union.h | 57 +++++++++++++++++++++----------------------------
 1 file changed, 24 insertions(+), 33 deletions(-)

(limited to 'include/glibtop/union.h')

diff --git a/include/glibtop/union.h b/include/glibtop/union.h
index c18bfc51..22dfe67d 100644
--- a/include/glibtop/union.h
+++ b/include/glibtop/union.h
@@ -1,5 +1,3 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-
 /* $Id$ */
 
 /* Copyright (C) 1998-99 Martin Baulig
@@ -46,49 +44,42 @@
 #include <glibtop/procargs.h>
 #include <glibtop/procmap.h>
 
-#include <glibtop/proccwd.h>
-
 #include <glibtop/mountlist.h>
 #include <glibtop/fsusage.h>
 
 #include <glibtop/netload.h>
-#include <glibtop/netinfo.h>
-#include <glibtop/interfaces.h>
 #include <glibtop/ppp.h>
 
-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
 
 typedef union _glibtop_union	glibtop_union;
 
 union _glibtop_union
 {
-    glibtop_cpu			cpu;
-    glibtop_mem			mem;
-    glibtop_swap		swap;
-    glibtop_uptime		uptime;
-    glibtop_loadavg		loadavg;
-    glibtop_shm_limits		shm_limits;
-    glibtop_msg_limits		msg_limits;
-    glibtop_sem_limits		sem_limits;
-    glibtop_array		proclist;
-    glibtop_proc_state		proc_state;
-    glibtop_proc_uid		proc_uid;
-    glibtop_proc_mem		proc_mem;
-    glibtop_proc_time		proc_time;
-    glibtop_proc_signal		proc_signal;
-    glibtop_proc_kernel		proc_kernel;
-    glibtop_proc_segment	proc_segment;
-    glibtop_proc_cwd		proc_cwd;
-    glibtop_array		proc_args;
-    glibtop_array		proc_map;
-    glibtop_array		mountlist;
-    glibtop_fsusage		fsusage;
-    glibtop_array		interface_names;
-    glibtop_netinfo		netinfo;
-    glibtop_netload		netload;
-    glibtop_ppp			ppp;
+	glibtop_cpu		cpu;
+	glibtop_mem		mem;
+	glibtop_swap		swap;
+	glibtop_uptime		uptime;
+	glibtop_loadavg		loadavg;
+	glibtop_shm_limits	shm_limits;
+	glibtop_msg_limits	msg_limits;
+	glibtop_sem_limits	sem_limits;
+	glibtop_proclist	proclist;
+	glibtop_proc_state	proc_state;
+	glibtop_proc_uid	proc_uid;
+	glibtop_proc_mem	proc_mem;
+	glibtop_proc_time	proc_time;
+	glibtop_proc_signal	proc_signal;
+	glibtop_proc_kernel	proc_kernel;
+	glibtop_proc_segment	proc_segment;
+	glibtop_proc_args	proc_args;
+	glibtop_proc_map	proc_map;
+	glibtop_mountlist	mountlist;
+	glibtop_fsusage		fsusage;
+	glibtop_netload		netload;
+	glibtop_ppp		ppp;
 };
 
-G_END_DECLS
+END_LIBGTOP_DECLS
 
 #endif
-- 
cgit v1.2.1