2.0.8 (huh?)

2003-12-19 Bastien Nocera <hadess@hadess.net> * configure.in: 2.0.8 (huh?)
Added "lt" to ALL_LINGUAS. Added Lithuanian translation by Tomas Kuliavas.
2003-12-19 16:08:23 +00:00 · 2003-11-04 17:05:42 +00:00 · 2003-11-03 14:04:36 +00:00 · 2003-10-29 15:17:21 +00:00 · 2003-10-25 17:17:40 +00:00 · 2003-10-25 16:40:16 +00:00
449 changed files with 24424 additions and 37330 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -33,9 +33,3 @@ libgtop.spec
 libgtop*.tar.gz
 *-debstamp
 libgtop*.pc
-autom4te.cache
-COPYING
-INSTALL
-install-sh
-missing
-mkinstalldirs
--- a/435
+++ b/435
@@ -1,226 +1,17 @@
-2004-06-13  Benoît Dejean  <tazforever@dlfp.org>
+2003-12-19  Bastien Nocera  <hadess@hadess.net>

-	* configure.in: version 2.6.1
+	* configure.in: 2.0.8 (huh?)

-2004-06-13  Benoît Dejean  <tazforever@dlfp.org>
-
-	* include/glibtop/sysinfo.h: Changed get_sysinfo prototype so that it
-	returns a const pointer. Added missing macro.
-
-2004-06-12  Benoît Dejean  <tazforever@dlfp.org>
-
-	* include/glibtop/fsusage.h: block_size is now defined as a guint32
-	instead of a fuzzy gint.
-	
-	* lib/sysdeps.c: (glibtop_get_sysdeps_r): Small cleanup.
-
-2004-06-12  Benoît Dejean  <tazforever@dlfp.org>
-
-	* lib/init.c: Added missing initializer.
-
-2004-06-09  Benoît Dejean <TazForEver@dlfp.org>
-
-	* *.{c,h} : whitespace clean up.
-
-2004-06-07  Benoît Dejean  <tazforever@dlfp.org>
-
-	* lib/parameter.c:
-	* support/popt.c: (poptGetContext): Cleaned.
-	
-	* support/vsnprintf.c: s/strncpy/g_strlcpy
-
-2004-05-28  Benoît Dejean <TazForEver@free.fr>
-
-	* examples/*: Added missing #include.
-	* ChangeLog: Converted to UTF-8.
-
-2004-04-16  Iñaki Larrañaga  <dooteo@euskalgnu.org>
-
-	* configure.in: Added "eu" (Basque) to ALL_LINGUAS.
-
-2004-04-09  Guntupalli Karunakar  <karunakar@freedomink.org>
-
-        * configure.in: Added "gu" (Gujarati) to ALL_LINGUAS.
-
-2004-04-07  Bastien Nocera  <hadess@hadess.net>
-
-	* configure.in: version 2.6.0
-
-2004-04-07  Bastien Nocera  <hadess@hadess.net>
-
-	* include/glibtop/fsusage.h: fix typo in the #defines for
-	FSUSAGE_BLOCK_SIZE (patch by Benoît Dejean <TazForEver@free.fr>)
-
-2004-03-30  Adam Weinberger  <adamw@gnome.org>
-
-	* configure.in: Added en_CA (Canadian English) to ALL_LINGUAS.
-
-2004-03-22  Gareth Owen  <gowen72@yahoo.com>
-
-	* configure.in: Added en_GB to ALL_LINGUAS
-
-2004-03-22  Guntupalli Karunakar  <karunakar@freedomink.org>
-
-        * configure.in: Added "pa" (Punjabi) to ALL_LINGUAS.
-
-2004-03-15  Bastien Nocera  <hadess@hadess.net>
-
-	* include/glibtop/fsusage.h: set GLIBTOP_MAX_FSUSAGE properly,
-	use gint in the headers instead of int (Closes: #125049)
-
-2004-03-11  Kjartan Maraas  <kmaraas@gnome.org>
-
-	* configure.in: Up versions etc.
-	* po/am.po: Update foo.
-	* po/ar.po:
-	* po/az.po:
-	* po/be.po:
-	* po/bg.po:
-	* po/bn.po:
-	* po/ca.po:
-	* po/cs.po:
-	* po/cy.po:
-	* po/da.po:
-	* po/de.po:
-	* po/el.po:
-	* po/es.po:
-	* po/et.po:
-	* po/fa.po:
-	* po/fi.po:
-	* po/fr.po:
-	* po/ga.po:
-	* po/gl.po:
-	* po/he.po:
-	* po/hi.po:
-	* po/hr.po:
-	* po/hu.po:
-	* po/id.po:
-	* po/it.po:
-	* po/ja.po:
-	* po/ko.po:
-	* po/lt.po:
-	* po/lv.po:
-	* po/mk.po:
-	* po/ml.po:
-	* po/mn.po:
-	* po/ms.po:
-	* po/nl.po:
-	* po/nn.po:
-	* po/no.po:
-	* po/pl.po:
-	* po/pt.po:
-	* po/pt_BR.po:
-	* po/ro.po:
-	* po/ru.po:
-	* po/sk.po:
-	* po/sl.po:
-	* po/sq.po:
-	* po/sr.po:
-	* po/sr@Latn.po:
-	* po/sv.po:
-	* po/ta.po:
-	* po/tr.po:
-	* po/uk.po:
-	* po/vi.po:
-	* po/zh_CN.po:
-	* po/zh_TW.po:
-
-2004-03-11  Bastien Nocera  <hadess@hadess.net>
-
-	* NEWS: update the NEWS file for the release
-
-2004-03-11  Bastien Nocera  <hadess@hadess.net>
-
-	* include/Makefile.am: fix distchecking
-
-2003-12-27  Ole Laursen  <olau@hardworking.dk>
-
-	* include/glibtop/fsusage.h: Added block_size field. (Closes: #125049)
-
-2004-03-05  Bastien Nocera  <hadess@hadess.net>
-
-	* include/glibtop/procmap.h: patch by Benoit Dejean <bnet@ifrance.com>
-	to break the API, I mean, to make it easier to generate Python bindings
-	(Closes: #129701)
-
-2004-03-04  Bastien Nocera  <hadess@hadess.net>
-
-	* configure.in:
-	* include/libgtop-i18n.h:
-	* lib/lib.pl:
-	* lib/read.c:
-	* lib/read_data.c:
-	* lib/write.c:
-	* sysdeps/names/cpu.c:
-	* sysdeps/names/fsusage.c:
-	* sysdeps/names/loadavg.c:
-	* sysdeps/names/mem.c:
-	* sysdeps/names/mountlist.c:
-	* sysdeps/names/msg_limits.c:
-	* sysdeps/names/netload.c:
-	* sysdeps/names/ppp.c:
-	* sysdeps/names/procargs.c:
-	* sysdeps/names/prockernel.c:
-	* sysdeps/names/proclist.c:
-	* sysdeps/names/procmap.c:
-	* sysdeps/names/procmem.c:
-	* sysdeps/names/procsegment.c:
-	* sysdeps/names/procsignal.c:
-	* sysdeps/names/procstate.c:
-	* sysdeps/names/proctime.c:
-	* sysdeps/names/procuid.c:
-	* sysdeps/names/sem_limits.c:
-	* sysdeps/names/shm_limits.c:
-	* sysdeps/names/swap.c:
-	* sysdeps/names/sysdeps.c:
-	* sysdeps/names/uptime.c: remove dependency on libgnome,
-	check for linux/isdn.h for distros using the 2.6 kernel headers
-
-2004-02-07  Kevin Vandersloot
-
-	* configure.in: release 2.5.1
-
-2004-02-02  Sebastien Bacher  <seb128@debian.org>
-
-	* sysdeps/linux/mem.c: (glibtop_get_mem_s): patch from 
-	BenoÃ®t Dejean <bnet@ifrance.com> to fix libtop_mem.used 
-	and glibtop_mem.shared values (Closes: #129863).
-
-Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
-
-	* libgtop-2.0.pc.in: Should be -lgtop-2.0, #130506
-
-2004-01-05  Frederic Crozat  <fcrozat@mandrakesoft.com>
-
-	* libgtop.spec.in: License is GPL, not LGPL.
-
-2004-01-05  Malcolm Tredinnick <malcolm@commsecure.com.au>
-
-	* libgtop-2.0.pc.in: Include -lgtop in the linking flags.
-	Bug #130506.
-
-2004-01-03  Robert Sedak  <robert.sedak@sk.htnet.hr>
-
-        * configure.in: Added "hr" in ALL_LINGUAS.
-
-2003-12-22  Bastien Nocera  <hadess@hadess.net>
-
-	* acinclude.m4:
-	* configure.in: remove linking to libgtop and checks for 64-bit
-	integer bytes (fixes warning on build on glib 2.0 systems)
-
-2003-11-02  ÄÅygimantas BeruÃÂka  <uid0@tuxfamily.org>
+2003-11-04  Žygimantas Beručka  <uid0@tuxfamily.org>

 	* configure.in: Added "lt" to ALL_LINGUAS.

 2003-10-21  Bastien Nocera  <hadess@hadess.net>

-	* Makefile.am:
-	* configure.in:
-	* src/inodedb/.cvsignore:
-	* sysdeps/names/Makefile.am:
-	install only one library, libgtop-2.0
-	Fix build-time warnings due to the redefinition of guint64
+	* lib/read.c: (glibtop_read_l):
+	* lib/read_data.c: (glibtop_read_data_l):
+	* lib/write.c: (glibtop_write_l): 
+	reverted string freeze breakage

 2003-10-20  Bastien Nocera  <hadess@hadess.net>

@@ -229,212 +20,22 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* lib/write.c: (glibtop_write_l): apply patch for ngettext support
 	by Christian Neumair <chris@gnome-de.org>

-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* include/glibtop/cpu.h:
-	* include/glibtop/procstate.h:
-	* include/glibtop/procuid.h:
-	* include/glibtop/uptime.h:
-	* lib/sysdeps.c:
-	* sysdeps/names/cpu.c:
-	* sysdeps/names/procstate.c:
-	* sysdeps/names/procuid.c:
-	* sysdeps/names/uptime.c: Apply patch by the_h1ghlander@yahoo.com and
-	Cory Omand <cory.omand@Sun.com> for Solaris support
-
 2003-10-20  Bastien Nocera  <hadess@hadess.net>

 	* src/inodedb/Makefile.am: link to libgtop_suid_common-2.0.la
 	(Closes: #107990)

-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* acconfig.h:
-	* acinclude.m4:
-	* include/glibtop/array.h:
-	* include/glibtop/command.h:
-	* include/glibtop/cpu.h:
-	* include/glibtop/fsusage.h:
-	* include/glibtop/glibtop-backend-info.h:
-	* include/glibtop/glibtop-backend.h:
-	* include/glibtop/glibtop-client.h:
-	* include/glibtop/inodedb.h:
-	* include/glibtop/interfaces.h:
-	* include/glibtop/limits.h:
-	* include/glibtop/loadavg.h:
-	* include/glibtop/mem.h:
-	* include/glibtop/mountlist.h:
-	* include/glibtop/msg_limits.h:
-	* include/glibtop/netinfo.h:
-	* include/glibtop/netload.h:
-	* include/glibtop/ppp.h:
-	* include/glibtop/procargs.h:
-	* include/glibtop/proccwd.h:
-	* include/glibtop/prockernel.h:
-	* include/glibtop/proclist.h:
-	* include/glibtop/procmap.h:
-	* include/glibtop/procmem.h:
-	* include/glibtop/procsegment.h:
-	* include/glibtop/procsignal.h:
-	* include/glibtop/procstate.h:
-	* include/glibtop/proctime.h:
-	* include/glibtop/procuid.h:
-	* include/glibtop/sem_limits.h:
-	* include/glibtop/shm_limits.h:
-	* include/glibtop/swap.h:
-	* include/glibtop/sysdeps.h:
-	* include/glibtop/sysinfo.h:
-	* include/glibtop/uptime.h:
-	* lib/glibtop-backend.c: (glibtop_backend_get):
-	* lib/glibtop-client.c: (glibtop_client_open_backend):
-	* lib/inodedb.c: (glibtop_inodedb_lookup_s):
-	* lib/lib.pl:
-	* src/inodedb/README.inodedb:
-	* src/inodedb/mkinodedb2.c: (main): s/u_int64_t/guint64/
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am: fix distchecking, release 2.5.0
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* configure.in: fix the library versioning to be hand-made rather
-	than uber-calculated from some esoteric numbers
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* glibtop.h:
-	* include/glibtop/close.h:
-	* include/glibtop/command.h:
-	* include/glibtop/cpu.h:
-	* include/glibtop/error.h:
-	* include/glibtop/fsusage.h:
-	* include/glibtop/global.h:
-	* include/glibtop/inodedb.h:
-	* include/glibtop/loadavg.h:
-	* include/glibtop/mem.h:
-	* include/glibtop/mountlist.h:
-	* include/glibtop/msg_limits.h:
-	* include/glibtop/netload.h:
-	* include/glibtop/open.h:
-	* include/glibtop/parameter.h:
-	* include/glibtop/ppp.h:
-	* include/glibtop/procargs.h:
-	* include/glibtop/prockernel.h:
-	* include/glibtop/proclist.h:
-	* include/glibtop/procmap.h:
-	* include/glibtop/procmem.h:
-	* include/glibtop/procsegment.h:
-	* include/glibtop/procsignal.h:
-	* include/glibtop/procstate.h:
-	* include/glibtop/proctime.h:
-	* include/glibtop/procuid.h:
-	* include/glibtop/read.h:
-	* include/glibtop/read_data.h:
-	* include/glibtop/sem_limits.h:
-	* include/glibtop/shm_limits.h:
-	* include/glibtop/signal.h:
-	* include/glibtop/swap.h:
-	* include/glibtop/sysdeps.h:
-	* include/glibtop/sysinfo.h:
-	* include/glibtop/types.h:
-	* include/glibtop/union.h:
-	* include/glibtop/uptime.h:
-	* include/glibtop/version.h:
-	* include/glibtop/write.h:
-	* lib/Makefile.am:
-	* lib/command.c: (glibtop_call_l):
-	* lib/init.c:
-	* lib/inodedb.c:
-	* lib/lib.pl:
-	* lib/open.c:
-	* lib/read.c:
-	* lib/read_data.c: (glibtop_read_data_l):
-	* lib/structures.pl:
-	* lib/write.c:
-	* sysdeps/names/cpu.c:
-	* sysdeps/names/fsusage.c:
-	* sysdeps/names/loadavg.c:
-	* sysdeps/names/mem.c:
-	* sysdeps/names/mountlist.c:
-	* sysdeps/names/msg_limits.c:
-	* sysdeps/names/netinfo.c:
-	* sysdeps/names/netload.c:
-	* sysdeps/names/ppp.c:
-	* sysdeps/names/procargs.c:
-	* sysdeps/names/proccwd.c:
-	* sysdeps/names/prockernel.c:
-	* sysdeps/names/proclist.c:
-	* sysdeps/names/procmap.c:
-	* sysdeps/names/procmem.c:
-	* sysdeps/names/procsegment.c:
-	* sysdeps/names/procsignal.c:
-	* sysdeps/names/procstate.c:
-	* sysdeps/names/proctime.c:
-	* sysdeps/names/procuid.c:
-	* sysdeps/names/sem_limits.c:
-	* sysdeps/names/shm_limits.c:
-	* sysdeps/names/swap.c:
-	* sysdeps/names/sysdeps.c:
-	* sysdeps/names/uptime.c: fixed compilation
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* RELNOTES-0.25: removed
-	* RELNOTES-1.0: removed
-	* RELNOTES-1.0.x: removed
-	* RELNOTES-1.1.x: removed
-	* include/glibtop/Makefile.am:
-	* include/glibtop/xmalloc.h: removed xmalloc.h
-	* lib/command.c: (glibtop_call_l):
-	* lib/init.c: (_init_server):
-	* lib/inodedb.c: (glibtop_inodedb_open_s),
-	(glibtop_inodedb_close_s):
-	* lib/read_data.c: (glibtop_read_data_l):
-	* lib/xmalloc.c: removed xmalloc.h
-	replace all the xmalloc crap by glib memory management functions
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* lib/Makefile.am:
-	* libgtop-config.in:
-	* libgtop.spec.in:
-	* libgtopConf.sh.in:
-	* src/inodedb/Makefile.am: removed traces of guile, intllibs and
-	libgnomesupport
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* .cvsignore: updated
-	* configure.in: removed all traces of guile stuff
-	* sysdeps/guile/.cvsignore: removed
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* sysdeps/Makefile.am:
-	* sysdeps/guile/ChangeLog:
-	* sysdeps/guile/Makefile.am:
-	* sysdeps/guile/guile.pl:
-	* sysdeps/guile/names/.cvsignore:
-	* sysdeps/guile/names/Makefile.am:
-	* sysdeps/guile/names/guile-names.pl: removed guile
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am:
-	* configure.in: remove guile and libgnome-support stuff
-
 2003-10-20  Bastien Nocera  <hadess@hadess.net>

 	* configure.in: make it compile

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

 	* support/*: Reverted libgtop changes. It's a common module
 	and I should not modify it.
 	* Added/removed files. Now the move should be done.

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

 	* libgtop-GNOME-2-0-branch moved to HEAD.

@@ -446,7 +47,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* configure.in: Added "ta" (Tamil) to the languages' list.

-2003-09-13  Carlos PerellÄÅ MarÄÂn <carlos@gnome.org>
+2003-09-13  Carlos Perelló Marín <carlos@gnome.org>

 	* configure.in (ALL_LINGUAS):  Removed es_ES.

@@ -499,7 +100,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* configure.in: release 2.0.2

-2003-05-10  Danilo ÄÂ egan  <dsegan@gmx.net>
+2003-05-10  Danilo Šegan  <dsegan@gmx.net>

 	* configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS.

@@ -519,7 +120,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* configure.in: Added he to ALL_LINGUAS.

-2003-02-25  T?Ãâivo Leedj?Ãâ¬rv  <toivo@linux.ee>
+2003-02-25  T?µivo Leedj?¤rv  <toivo@linux.ee>

 	* configure.in: Added et to ALL_LINGUAS.

@@ -1223,7 +824,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 1998-10-20  Martin Baulig  <martin@home-of-linux.org>

 	* include/glibtop/proc_signal.h: Use a 2-element-array of
-	type `guint64' for all signal masks instead of just
+	type `u_int64_t' for all signal masks instead of just
 	scalar numbers. This avoids problems on systems with more
 	than 64 signals.

@@ -1233,7 +834,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	[NOTE for people porting libgtop:
 	
- 	 Please use all 64 bits of the `guint64' and not just 32 - the
+ 	 Please use all 64 bits of the `u_int64_t' and not just 32 - the
 	 signal number (as it is used in calls to kill () ...) should be
 	 a bit-index into this field; if a process ignores for instance
 	 signal 64, it has the 0-bit of sigcatch[1] set, if it ignores 63,
@@ -1373,7 +974,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>
 	* include/glibtop/command.h (glibtop_call): Third argument is
 	now `const void *'.

-	* include/glibtop/xmalloc.h (g_free): Now taking a
+	* include/glibtop/xmalloc.h (glibtop_free): Now taking a
 	`const void *'.

 1998-08-25  Martin Baulig  <martin@home-of-linux.org>
@@ -1574,14 +1175,14 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 1998-07-30  Martin Baulig  <martin@home-of-linux.org>

-	* acconfig.h (guint64, int64_t): Added.
+	* acconfig.h (u_int64_t, int64_t): Added.

 	* lib/lib.awk: Using correct `(1 << GLIBTOP_SYSDEPS_<feature>)'
 	in call to `glibtop_init_r'.

 	* configure.in (GNOME_LIBGTOP_TYPES): New check.

-	* include/glibtop/*.h: Using `guint64' instead of `unsigned long'
+	* include/glibtop/*.h: Using `u_int64_t' instead of `unsigned long'
 	and `long' to avoid problems when client is on a 32bit system and
 	the server on a 64bit system.

@@ -1959,7 +1560,7 @@ Wed Jan  7 02:23:28 2004  Jonathan Blandford  <jrb@gnome.org>

 	* glibtop.h (_glibtop): New field `server_port'.

-	* lib/xmalloc.c (g_strdup): New function.
+	* lib/xmalloc.c (glibtop_strdup_r): New function.

 	* lib/gnuclient.c: Removed.
 	
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,93 @@
+## Process this file with automake to produce Makefile.in.

-SUBDIRS = po misc include sysdeps lib src examples doc
+if EXAMPLES
+examples_SUBDIRS = examples
+else
+examples_SUBDIRS =
+endif
+
+if BUILD_GNOME_SUPPORT
+support = support
+endif
+
+SUBDIRS = . po $(support) misc include sysdeps lib src \
+	  $(examples_SUBDIRS) doc

 libgtopinclude_HEADERS = glibtop.h
 libgtopincludedir = $(includedir)/libgtop-2.0

-EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \
-	LIBGTOP-VERSION features.def \
-	libgtop-sysdeps.m4 README \
+EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \
+	LIBGTOP-VERSION features.def libgtop-config.in RELNOTES-0.25 \
+	RELNOTES-1.0 RELNOTES-1.0.x libgtop-sysdeps.m4 README \
 	libgtop-mirror.sh libgtop-2.0.pc.in acinclude.m4

 dist-hook:
 	cp libgtop.spec $(distdir)

+release:
+	$(MAKE) dist distdir=$(PACKAGE)-$(VERSION)
+
+## Put `exec' in the name because this should be installed by
+## `install-exec', not `install-data'.
+## confexecdir	= $(libdir)
+## confexec_DATA	= $(top_builddir)/libgtopConf.sh \
+##		  $(top_builddir)/libgtop-features.def
+		  
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libgtop-2.0.pc

+CLEANFILES=libgtopConf.sh
+
+## bin_SCRIPTS = $(top_builddir)/libgtop-config
+
+## to automatically rebuild aclocal.m4 if any of the macros in
+## `macros/' change
+## @MAINT@ include macros/macros.dep
+## @MAINT@macros/macros.dep: macros/Makefile.am
+## @MAINT@	cd macros && $(MAKE) macros.dep
+
+@MAINT@$(top_srcdir)/aclocal.m4: libgtop-sysdeps.m4 LIBGTOP-VERSION
+
+## We create libgtopConf.sh here and not from configure because we want
+## to get the paths expanded correctly.  Macros like srcdir are given
+## the value NONE in configure if the user doesn't specify them (this
+## is an autoconf feature, not a bug).
+libgtopConf.sh: libgtopConf.sh.in Makefile
+## Use sed and then mv to avoid problems if the user interrupts.
+	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
+	  -e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)/libgtop-2.0#g' \
+	  -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
+	  -e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
+	  -e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \
+	  -e 's#\@LIBGTOP_INCS\@#$(LIBGTOP_INCS)#g' \
+	  -e 's#\@LIBGTOP_NAMES_LIBS\@#$(LIBGTOP_NAMES_LIBS)#g' \
+	  -e 's#\@LIBGTOP_NAMES_INCS\@#$(LIBGTOP_NAMES_INCS)#g' \
+	  -e 's#\@LIBGTOP_GUILE_LIBS\@#$(LIBGTOP_GUILE_LIBS)#g' \
+	  -e 's#\@LIBGTOP_GUILE_INCS\@#$(LIBGTOP_GUILE_INCS)#g' \
+	  -e 's#\@LIBGTOP_GUILE_NAMES_LIBS\@#$(LIBGTOP_GUILE_NAMES_LIBS)#g' \
+	  -e 's#\@LIBGTOP_GUILE_NAMES_INCS\@#$(LIBGTOP_GUILE_NAMES_INCS)#g' \
+	  -e 's#\@LIBGTOP_BINDIR\@#$(LIBGTOP_BINDIR)#g' \
+	  -e 's#\@LIBGTOP_SERVER\@#$(LIBGTOP_SERVER)#g' \
+	  -e 's#\@LIBGTOP_MAJOR_VERSION\@#$(LIBGTOP_MAJOR_VERSION)#g' \
+	  -e 's#\@LIBGTOP_MINOR_VERSION\@#$(LIBGTOP_MINOR_VERSION)#g' \
+	  -e 's#\@LIBGTOP_MICRO_VERSION\@#$(LIBGTOP_MICRO_VERSION)#g' \
+	  -e 's#\@LIBGTOP_VERSION\@#$(LIBGTOP_VERSION)#g' \
+	  -e 's#\@LIBGTOP_VERSION_CODE\@#$(LIBGTOP_VERSION_CODE)#g' \
+	  -e 's#\@LIBGTOP_SERVER_VERSION\@#$(LIBGTOP_SERVER_VERSION)#g' \
+	  -e 's#\@libgtop_sysdeps_dir\@#$(libgtop_sysdeps_dir)#g' \
+	  -e 's#\@libgtop_need_server\@#$(libgtop_need_server)#g' \
+	  -e 's#\@libgtop_use_machine_h\@#$(libgtop_use_machine_h)#g' \
+	  -e 's#\@libgtop_guile_found\@#$(libgtop_guile_found)#g' \
+	  -e 's#\@libgtop_want_examples\@#$(libgtop_want_examples)#g' \
+	      < $(srcdir)/libgtopConf.sh.in > libgtopConf.tmp \
+	  && mv libgtopConf.tmp libgtopConf.sh
+
+# libgtop-config: libgtop-config.in Makefile
+#	sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
+#	      < $(srcdir)/libgtop-config.in > libgtop-config.tmp \
+#	  && mv libgtop-config.tmp libgtop-config && \
+#		chmod 755 libgtop-config
+
 libgtop-features.def: features.def
 	@LN_S@ $< $@

--- a/29
+++ b/29
@@ -1,32 +1,3 @@
-July 11, 2004:
-==============
-
-* Released LibGTop 2.6.1
-
-  - code cleanups.
-  
-  - glibtop_mountlist()'s all_fs parameter now works.
-  
-  - glibtop_uptime.boot_time is set on every arch.
-  
-  - linux SMP support is fixed.
-  
-  - Replaced unsafe strcpy by g_strlcpy.
-
-March 11, 2004:
-===============
-
-* Released LibGTop 2.5.99 "Gross Work", dedicated to people who do push-ups
-  in the loos.
-
-  - plenty of code cleanups
-
-  - removed the dependency on libgnome, only glib required now
-
-  - Linux 2.6 support, NetBSD support and better FreeBSD support
-
-  - Make the block size available for filesystem statistics
-
 February 27, 2001:
 =================

--- a/RELNOTES-0.25
+++ b/RELNOTES-0.25
@@ -0,0 +1,146 @@
+RELEASE NOTES FOR LIBGTOP 0.25 STABLE
+=====================================
+
+OVERVIEW
+--------
+
+LibGTop is a library that read information about processes and the running
+systems. This information include:
+
+General System Information
+
+cpu		- CPU Usage
+mem		- Memory Usage
+swap		- Swap Usage (including paging activity)
+loadavg		- Load average (including nr_running, nr_tasks, last_pid)
+uptime		- Uptime and Idle time, can be calculated from CPU usage
+
+SYS V IPC Limits:
+
+shm_limits	- Shared Memory Limits
+msg_limits	- Message Queue Limits
+sem_limits	- Semaphore Set Limits
+
+Process List:
+
+proclist	- List of processes
+
+Process information:
+
+proc_state	- cmd, state, uid, gid
+proc_uid	- uid,euid,gid,egid,pid,ppid,pgrp
+		  session,tty,tpgid,priority,nice
+proc_mem	- size,vsize,resident,share,rss,rss_rlim
+proc_time	- start_time,rtime,utime,stime,cutime,cstime
+		  timeout,it_real_value,frequency
+proc_signal	- signal,blocked,sigignore,sigcatch
+proc_kernel	- k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt
+		  kstk_esp,kstk_eip,nwchan,wchan
+proc_segment	- text_rss,shlib_rss,data_rss,stack_rss,dirty_size
+		  start_code,end_code,start_stack
+
+Process maps:
+
+proc_map	- Process map (/proc/<pid>/maps under Linux)
+
+File system usage:
+
+mountlist	- List of currently mounted filesystems
+fsusage		- File system usage
+
+PORTABILITY:
+-----------
+
+LibGtop is designed to be as portable as possible. None of the functions
+and retrieved information should be specific to a specific operating
+system. So you only need to port the system dependent part of the library
+to a new system and all application programs can then use libgtop on this
+new system.
+
+CLIENT/SERVER MODEL:
+-------------------
+
+Some systems like DEC OSF/1 or BSD require special priviledges for the calling
+proces to fetch the required information (SUID root/SGID kmem). To solve this
+problem, I designed a client/server model which makes a call to a SUID/SGID
+server which fetches the required information whenever it is required. This
+server is only called for features that really require priviledges, otherwise
+the sysdeps code is called directory (every user can get the CPU usage on
+DEC OSF/1, but only root can get information about processes other than the
+current one).
+
+There is also some kind of daemon which can be used to fetch information from
+remote systems (still experimental). This daemon normally runs as nobody and
+calls the SUID/SGID itself when needed.
+
+GNOME APPLETS:
+--------------
+
+There are some applets and applications which already use LibGTop. They can
+be found in the `libgtop-apps' module in the GNOME CVS tree:
+
+* Applets:  cpuload, cpumemusage - they need LibGTop to get their information
+                                   on all systems other than Linux.
+
+* Applets:  diskusage - just uses the mountlist/fsusage features of LibGTop,
+                        the one in gnome-core also works on other systems.
+
+* Applets:  multiload - I enhanced the cpuload applet a little bit, it is
+                        now a multi applet and can display CPU, Memory and
+                        Swap usages.
+
+GTOP:
+----
+
+This cool GNOME app has been ported to use LibGTop. It can be found in
+`libgtop-apps/gtop' in the GNOME CVS tree.
+
+You can now use nearly the full functionality of GTop on FreeBSD !
+
+
+PLATTFORM SPECIFIC NOTES FOR LINUX:
+==================================
+
+Under Linux, LibGTop should work without problems and read everything
+from /proc.
+
+There is also an experimental kernel interface to read this information
+directly from the kernel with a system call - but this is still experimental
+and not well tested while I made this release.
+
+PLATTFORM SPECIFIC NOTES FOR FREEBSD:
+====================================
+
+LibGTop should now work under FreeBSD and give you the full functionality
+of GTop.
+
+There are a few caveats:
+
+* You need to manually make the `$(prefix)/bin/libgtop_server' SGID to kmem
+  after installation and mount the /proc filesystem of FreeBSD
+  (/proc/<pid>/mem is used withing kvm_uread ()).
+
+* To get the filenames of the process maps displayed in GTop, you need to
+  configure with the `--with-libgtop-inodedb' option (you need GDBM for this
+  to work).
+
+* You have then to create an inode database which is used to look up to
+  filenames. This is done using the `mkinodedb' program which comes along
+  with libgtop.
+
+  See the file src/inodedb/README for details:
+
+  The `mkinodedb' program which is build in this directory takes two
+  command line arguments: the full pathname of the database to be created
+  and the name of a configuration file consisting of directory and file names
+  each on a line by itself - see `/etc/ld.so.conf' for an example.
+
+  Putting a directory name in this file means all regular files found in this
+  directory are included in the database, but it will not recursively descend
+  into subdirectories (for instance, we want everythink in `/usr/lib' but not
+  every single file in `/usr/lib/sgml'). You can also use filenames to include
+  a single file.
+
+Have fun,
+
+Martin <martin@home-of-linux.org>
--- a/RELNOTES-1.0
+++ b/RELNOTES-1.0
@@ -0,0 +1,163 @@
+RELEASE NOTES FOR LIBGTOP 1.0 STABLE
+====================================
+
+OVERVIEW
+--------
+
+LibGTop is a library that read information about processes and the
+running systems. This information include:
+
+General System Information:
+
+cpu		- CPU Usage
+mem		- Memory Usage
+swap		- Swap Usage (including paging activity)
+loadavg		- Load average (including nr_running, nr_tasks, last_pid)
+uptime		- Uptime and Idle time, can be calculated from CPU usage
+
+SYS V IPC Limits:
+
+shm_limits	- Shared Memory Limits
+msg_limits	- Message Queue Limits
+sem_limits	- Semaphore Set Limits
+
+Network:
+
+netload		- Network load
+ppp		- PPP statistics
+
+Process List:
+
+proclist	- List of processes
+
+Process information:
+
+proc_state	- cmd, state, uid, gid
+proc_uid	- uid,euid,gid,egid,pid,ppid,pgrp
+		  session,tty,tpgid,priority,nice
+proc_mem	- size,vsize,resident,share,rss,rss_rlim
+proc_time	- start_time,rtime,utime,stime,cutime,cstime
+		  timeout,it_real_value,frequency
+proc_signal	- signal,blocked,sigignore,sigcatch
+proc_kernel	- k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt
+		  kstk_esp,kstk_eip,nwchan,wchan
+proc_segment	- text_rss,shlib_rss,data_rss,stack_rss,dirty_size
+		  start_code,end_code,start_stack
+
+Process maps:
+
+proc_args	- Command line arguments
+proc_map	- Process map (/proc/<pid>/maps under Linux)
+
+File system usage:
+
+mountlist	- List of currently mounted filesystems
+fsusage		- File system usage
+
+PORTABILITY:
+-----------
+
+LibGTop is designed to be as portable as possible. None of the
+functions and retrieved information should be specific to a specific
+operating system. So you only need to port the system dependent part
+of the library to a new system and all application programs can then
+use libgtop on this new system.
+
+CLIENT/SERVER MODEL:
+-------------------
+
+Some systems like DEC OSF/1 or BSD require special privileges for the
+calling process to fetch the required information (SUID root/SGID
+kmem). To solve this problem, I designed a client/server model which
+makes a call to a SUID/SGID server which fetches the required
+information whenever it is required. This server is only called for
+features that really require privileges, otherwise the sysdeps code
+is called directory (every user can get the CPU usage on DEC OSF/1,
+but only root can get information about processes other than the
+current one).
+
+There is also some kind of daemon which can be used to fetch
+information from remote systems (still experimental). This daemon
+normally runs as nobody and calls the SUID/SGID itself when needed.
+
+LIBGTOP AND GNOME:
+-----------------
+
+LibGTop is currently used in various places in the GNOME Project,
+for instance in some of the applets in gnome-core and - of cause -
+this ultra-cool application called GTop ...
+
+Although LibGTop is not specific to GNOME and under GPL license, I
+spent most my time during the last months to work in the GNOME project
+so this is the primary use for LibGTop (and currently the only one).
+
+However, you can also give its configure.in script the `--without-gnome'
+parameter and then use it fully without GNOME in your own applications.
+
+LIBGTOP AND GNOME - PART II:
+---------------------------
+
+LibGTop was tested with FreeBSD 3.0 but it should also work with
+FreeBSD 2.2.7, NetBSD and OpenBSD.
+
+Currently my primary aim is to help the GNOME people with our 1.0 release
+so I won't have much time to test it with any other system than Linux.
+
+However, I consider FreeBSD, NetBSD and OpenBSD as supported systems for
+LibGTop and whenever I get bug reports I will do my best to fix them as
+quickly as possible.
+
+PLATFORM SPECIFIC NOTES FOR LINUX:
+==================================
+
+Under Linux, LibGTop should work without problems and read everything
+from /proc.
+
+LibGTop 0.25 also had an experimental kernel interface to read this
+information directly from the kernel with a system call - but I have
+currently dropped support for this as I am too busy with GNOME
+development to keep current with kernel hacking.
+
+PLATFORM SPECIFIC NOTES FOR SOLARIS:
+====================================
+
+Since so many people were asking me about this:
+
+LibGTop currently does not have any support for Solaris, and it will
+never have until some volunteer writes the code for it. I can't do this
+myself since I do not have any machine to test it on.
+
+PLATFORM SPECIFIC NOTES FOR BSD:
+=================================
+
+There are a few caveats:
+
+* You need to manually make the `$(prefix)/bin/libgtop_server' SGID to
+  kmem after installation and mount the /proc file system of FreeBSD
+  (/proc/<pid>/mem is used within kvm_uread ()).
+
+* To get the filenames of the process maps displayed in GTop, you need
+  to configure with the `--with-libgtop-inodedb' option (you need GDBM
+  for this to work).
+
+  You have then to create an inode database which is used to look up
+  filenames. This is done using the `mkinodedb' program which comes
+  along with libgtop.
+
+  See the file src/inodedb/README for details:
+
+  The `mkinodedb' program which is build in this directory takes two
+  command line arguments: the full pathname of the database to be
+  created and the name of a configuration file consisting of directory
+  and file names each on a line by itself - see `/etc/ld.so.conf' for
+  an example.
+
+  Putting a directory name in this file means all regular files found
+  in this directory are included in the database, but it will not
+  recursively descend into subdirectories (for instance, we want
+  everything in `/usr/lib' but not every single file in `/usr/lib/sgml').
+  You can also use filenames to include a single file.
+
+Have fun,
+
+Martin <martin@home-of-linux.org>
--- a/RELNOTES-1.0.x
+++ b/RELNOTES-1.0.x
@@ -0,0 +1,172 @@
+RELEASE NOTES FOR LIBGTOP 1.0.7
+===============================
+
+OVERVIEW
+--------
+
+LibGTop is a library that read information about processes and the
+running systems. This information include:
+
+General System Information:
+
+cpu		- CPU Usage
+mem		- Memory Usage
+swap		- Swap Usage (including paging activity)
+loadavg		- Load average (including nr_running, nr_tasks, last_pid)
+uptime		- Uptime and Idle time, can be calculated from CPU usage
+
+SYS V IPC Limits:
+
+shm_limits	- Shared Memory Limits
+msg_limits	- Message Queue Limits
+sem_limits	- Semaphore Set Limits
+
+Network:
+
+netload		- Network load
+ppp		- PPP statistics
+
+Process List:
+
+proclist	- List of processes
+
+Process information:
+
+proc_state	- cmd, state, uid, gid
+proc_uid	- uid,euid,gid,egid,pid,ppid,pgrp
+		  session,tty,tpgid,priority,nice
+proc_mem	- size,vsize,resident,share,rss,rss_rlim
+proc_time	- start_time,rtime,utime,stime,cutime,cstime
+		  timeout,it_real_value,frequency
+proc_signal	- signal,blocked,sigignore,sigcatch
+proc_kernel	- k_flags,min_flt,maj_flt,cmin_flt,cmaj_flt
+		  kstk_esp,kstk_eip,nwchan,wchan
+proc_segment	- text_rss,shlib_rss,data_rss,stack_rss,dirty_size
+		  start_code,end_code,start_stack
+
+Process maps:
+
+proc_args	- Command line arguments
+proc_map	- Process map (/proc/<pid>/maps under Linux)
+
+File system usage:
+
+mountlist	- List of currently mounted filesystems
+fsusage		- File system usage
+
+PORTABILITY:
+-----------
+
+LibGTop is designed to be as portable as possible. None of the
+functions and retrieved information should be specific to a specific
+operating system. So you only need to port the system dependent part
+of the library to a new system and all application programs can then
+use libgtop on this new system.
+
+CLIENT/SERVER MODEL:
+-------------------
+
+Some systems like DEC OSF/1 or BSD require special privileges for the
+calling process to fetch the required information (SUID root/SGID
+kmem). To solve this problem, I designed a client/server model which
+makes a call to a SUID/SGID server which fetches the required
+information whenever it is required. This server is only called for
+features that really require privileges, otherwise the sysdeps code
+is called directory (every user can get the CPU usage on DEC OSF/1,
+but only root can get information about processes other than the
+current one).
+
+There is also some kind of daemon which can be used to fetch
+information from remote systems (still experimental). This daemon
+normally runs as nobody and calls the SUID/SGID itself when needed.
+
+LIBGTOP AND GNOME:
+-----------------
+
+Although LibGTop is part of the GNOME desktop environment, its main
+interface is totally independent from any particular desktop environment,
+so you can also use it as a standalone library in any piece of GPLed
+software which makes it also a valuable part of the GNU project.
+
+LibGTop is currently used in various places in the GNOME Project,
+for instance in some of the applets in gnome-core and - of cause -
+this ultra-cool application called GTop ...
+
+However, you need to give the configure.in script the `--without-gnome'
+parameter when you want to use LibGTop without GNOME (this is because,
+if you want to use it with GNOME, you need to compile it after the main
+GNOME libraries and I wanted to avoid getting unnecessary bug reports
+about this).
+
+LIBGTOP AND GNOME - PART II:
+---------------------------
+
+LibGTop was tested with FreeBSD 3.0 but it should also work with
+FreeBSD 2.2.7, NetBSD and OpenBSD.
+
+Unfortunately, I don't have the power and disk space to install all
+possible operating systems out there on my machine and test things myself,
+so I depend on people telling me whether it works and sending me bug
+reports and patches if not.
+
+However, I consider FreeBSD, NetBSD and OpenBSD as supported systems for
+LibGTop and whenever I get bug reports I will do my best to fix them as
+quickly as possible.
+
+PLATFORM SPECIFIC NOTES FOR LINUX:
+==================================
+
+[I am speaking of the Linux kernel here.]
+
+Under Linux, LibGTop should work without problems and read everything
+from /proc.
+
+LibGTop 0.25 also had an experimental kernel interface to read this
+information directly from the kernel with a system call - but I have
+currently dropped support for this as I am too busy with GNOME
+development to keep current with kernel hacking.
+
+PLATFORM SPECIFIC NOTES FOR SOLARIS:
+====================================
+
+The development branch of LibGTop (the 1.1.x series) has a first version
+of the Solaris port which works at least on Solaris 7.
+
+If you are on a Solaris system and want to give it a try, just fetch the
+latest 1.1.x tarball from ftp://ftp.home-of-linux.org/pub/libgtop/1.1/
+and try it out.
+
+PLATFORM SPECIFIC NOTES FOR BSD:
+=================================
+
+There are a few caveats:
+
+* You need to manually make the `$(prefix)/bin/libgtop_server' SGID to
+  kmem after installation and mount the /proc file system of FreeBSD
+  (/proc/<pid>/mem is used within kvm_uread ()).
+
+* To get the filenames of the process maps displayed in GTop, you need
+  to configure with the `--with-libgtop-inodedb' option (you need GDBM
+  for this to work).
+
+  You have then to create an inode database which is used to look up
+  filenames. This is done using the `mkinodedb' program which comes
+  along with libgtop.
+
+  See the file src/inodedb/README for details:
+
+  The `mkinodedb' program which is build in this directory takes two
+  command line arguments: the full pathname of the database to be
+  created and the name of a configuration file consisting of directory
+  and file names each on a line by itself - see `/etc/ld.so.conf' for
+  an example.
+
+  Putting a directory name in this file means all regular files found
+  in this directory are included in the database, but it will not
+  recursively descend into subdirectories (for instance, we want
+  everything in `/usr/lib' but not every single file in `/usr/lib/sgml').
+  You can also use filenames to include a single file.
+
+Have fun,
+
+Martin <martin@home-of-linux.org>
--- a/RELNOTES-1.1.x
+++ b/RELNOTES-1.1.x
@@ -0,0 +1,50 @@
+RELEASE NOTES FOR LIBGTOP 1.1.2
+===============================
+
+This is a snapshot release for Solaris users of October GNOME. It contains
+a first version of the Solaris port of LibGTop which works at least on
+Solaris 7.
+
+Please use LibGTop 1.0.x if you're not on a Solaris system
+(look at the README file for details).
+
+IMPORTANT CHANGES SINCE 1.0:
+----------------------------
+
+* All `glibtop_get_<feature>_* ()' and all `glibtop_init_<feature>_* ()'
+  functions now have an `int' return value and return 0 on success and -1
+  on failure.
+
+* glibtop_cpu: Added `xcpu_flags'
+
+* glibtop_proc_state: Changed `state' from char to unsigned and added
+    GLIBTOP_PROCESS_RUNNING, GLIBTOP_PROCESS_INTERRUPTIBLE,
+    GLIBTOP_PROCESS_UNINTERRUPTIBLE,  GLIBTOP_PROCESS_ZOMBIE,
+    GLIBTOP_PROCESS_STOPPED, GLIBTOP_PROCESS_SWAPPING constants for it.
+
+* `GLIBTOP_MOUNTENTRY_LEN' and `GLIBTOP_MAX_GROUPS' are now defined in
+  <glibtop/limits.h>
+
+* Removed the `GLIBTOP_SYSDEPS_FEATURES' and `GLIBTOP_SYSDEPS_POINTER_SIZE'
+  constants from <glibtop/sysdeps.h> and let numbering start at zero for
+  `GLIBTOP_SYSDEPS_CPU'.
+
+OTHER CHANGES SINCE 1.0:
+-----------------------
+
+* Use G_GNUC_UNUSED in <glibtop/error.h> to avoid compiler warnings.
+
+* The `libgtop-config' script now accepts `--cflags', `--libs' and
+  `--extra-libs' parameter.
+
+* The libraries are now called -lgtop-1.1 etc. so you can use 1.0.x and
+  1.1.x in parallel.
+
+CHANGES SINCE 1.0 MAINLY INTERESTING FOR DEVELOPERS:
+---------------------------------------------------
+
+* We create a `glibtop-config.h' now which gets included from <glibtop.h>
+  when we're _IN_LIBGTOP. It contains things such as `u_int64_t' etc.
+
+October 1999
+Martin Baulig
--- a/acconfig.h
+++ b/acconfig.h
@@ -126,7 +126,7 @@
 #undef HAVE_GUILE

 #undef ssize_t
-#undef guint64
+#undef u_int64_t
 #undef int64_t

 #undef HAVE_GLIBTOP_MACHINE_H
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -43,6 +43,8 @@ dnl
 AC_DEFUN([GNOME_LIBGTOP_TYPES],
 [
        AC_CHECK_HEADERS(sys/bitypes.h)
+        AC_LIBGTOP_CHECK_TYPE(u_int64_t, unsigned long long int)
+        AC_LIBGTOP_CHECK_TYPE(int64_t, signed long long int)
 ])

 dnl See whether we need a declaration for a function.
--- a/backends/common/ChangeLog
+++ b/backends/common/ChangeLog
@@ -1,11 +1,3 @@
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-common.c: (_open_common): s/u_int64_t/guint64/
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-common.h: fixed compilation
-
 2000-11-26  Martin Baulig  <martin@home-of-linux.org>

 	* glibtop-backend-private.h: Removed.
--- a/backends/common/backend-common.c
+++ b/backends/common/backend-common.c
@@ -26,7 +26,7 @@
 #include <backend-common.h>

 static int
-_open_common (glibtop_server *, glibtop_backend *, guint64, const char **);
+_open_common (glibtop_server *, glibtop_backend *, u_int64_t, const char **);

 static int
 _close_common (glibtop_server *, glibtop_backend *, void *closure);
@@ -47,7 +47,7 @@ glibtop_backend_info LibGTopBackendInfo_Common = {

 static int
 _open_common (glibtop_server *server, glibtop_backend *backend,
-	      guint64 features, const char **backend_args)
+	      u_int64_t features, const char **backend_args)
 {
    return 0;
 }
--- a/backends/common/backend-common.h
+++ b/backends/common/backend-common.h
@@ -30,6 +30,7 @@
 #include <glibtop/global.h>

 #include <glibtop/open.h>
+#include <glibtop/xmalloc.h>
 #include <glibtop/glibtop-backend.h>
 #include <glibtop/glibtop-backend-info.h>

--- a/backends/server/ChangeLog
+++ b/backends/server/ChangeLog
@@ -1,39 +1,3 @@
-2004-03-09  Bastien Nocera  <hadess@hadess.net>
-
-	* command.c: (glibtop_call_i):
-	* demarshal.pl:
-	* marshal.pl:
-	* read_data.c: (glibtop_read_data_i):
-	* server.c: (handle_slave_connection): fix g_malloc usage on non-Linux
-	platforms (patch by Benoit Dejean <bnet@ifrance.com>)
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-server.c: (_open_server):
-	* backend-server.h:
-	* command.h.in: s/u_int64_t/guint64/
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-server.h:
-	* command.h.in:
-	* demarshal.pl:
-	* server.h: fixed compilation
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-server.c: (_open_server):
-	* command.c: (glibtop_call_i):
-	* demarshal.pl:
-	* marshal.pl:
-	* read_data.c: (glibtop_read_data_i):
-	* server.c: (main), (handle_slave_connection):
-	replace all the xmalloc crap by glib memory management functions
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am: removed traces of guile, intllibs and libgnomesupport
-
 2000-11-27  Martin Baulig  <martin@home-of-linux.org>

 	* backend-server.c (backend_server_quark): New global variable.
--- a/backends/server/Makefile.am
+++ b/backends/server/Makefile.am
@@ -50,7 +50,8 @@ libgtop_server_SOURCES = \

 libgtop_server_LDADD = \
 	$(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid.la \
-	$(top_builddir)/sysdeps/common/libgtop_suid_common.la
+	$(top_builddir)/sysdeps/common/libgtop_suid_common.la \
+	@LIBSUPPORT@

 if ENABLE_STATIC
 libgtop_server_LDFLAGS = -static
--- a/backends/server/backend-server.c
+++ b/backends/server/backend-server.c
@@ -26,7 +26,7 @@
 #include <backend-server.h>

 static int
-_open_server (glibtop_server *, glibtop_backend *, guint64, const char **);
+_open_server (glibtop_server *, glibtop_backend *, u_int64_t, const char **);

 static int
 _close_server (glibtop_server *, glibtop_backend *, void *);
@@ -47,11 +47,11 @@ glibtop_backend_info LibGTopBackendInfo_Server = {

 static int
 _open_server (glibtop_server *server, glibtop_backend *backend,
-	      guint64 features, const char **backend_args)
+	      u_int64_t features, const char **backend_args)
 {
    backend_server_private *priv;

-    priv = g_malloc (sizeof (backend_server_private));
+    priv = glibtop_calloc_r (server, 1, sizeof (backend_server_private));

    glibtop_backend_set_closure_data (backend, priv);

--- a/backends/server/backend-server.h
+++ b/backends/server/backend-server.h
@@ -30,6 +30,7 @@
 #include <glibtop/global.h>

 #include <glibtop/open.h>
+#include <glibtop/xmalloc.h>
 #include <glibtop/glibtop-backend.h>
 #include <glibtop/glibtop-backend-info.h>

@@ -37,7 +38,7 @@ typedef struct _backend_server_private backend_server_private;

 struct _backend_server_private
 {
-    guint64 flags;
+    u_int64_t flags;
    int input [2];		/* Pipe client <- server */
    int output [2];		/* Pipe client -> server */
    pid_t pid;			/* PID of the server */
--- a/backends/server/command.c
+++ b/backends/server/command.c
@@ -57,7 +57,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
    }

    cmnd.data_size = data_size;
-
+	
    glibtop_write_i (priv, sizeof (glibtop_command), &cmnd);

    if (data_size) {
@@ -75,7 +75,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
 	     (long) resp.recv_size, (long) resp.data_size,
 	     recv_ptr, (long) recv_size);
 #endif
-
+    
    if (retval_ptr)
 	*retval_ptr = resp.glibtop_errno;

@@ -89,7 +89,7 @@ glibtop_call_i (glibtop_server *server, backend_server_private *priv,
 	glibtop_read_i (priv, recv_size, recv_ptr);

    if (resp.data_size) {
-	void *ptr = g_malloc (resp.data_size);
+	void *ptr = glibtop_malloc_r (server, resp.data_size);

 	glibtop_read_i (priv, resp.data_size, ptr);

--- a/backends/server/command.h.in
+++ b/backends/server/command.h.in
@@ -31,7 +31,7 @@
 #include <glibtop.h>
 #include <glibtop/union.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

@@GLIBTOP_COMMAND_CONSTANTS@@

@@ -42,8 +42,8 @@ typedef struct _glibtop_response	glibtop_response;

 struct _glibtop_command
 {
-    guint64	command;
-    guint64	param_size, send_size, data_size;
+    u_int64_t	command;
+    u_int64_t	param_size, send_size, data_size;
    char	parameter [_GLIBTOP_PARAM_SIZE];
 };

@@ -51,9 +51,9 @@ struct _glibtop_response
 {
    int retval;
    int glibtop_errno;
-    guint64 recv_size, data_size;
+    u_int64_t recv_size, data_size;
 };

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/backends/server/demarshal.pl
+++ b/backends/server/demarshal.pl
@@ -26,6 +26,7 @@ print '';

 print '#include <glibtop.h>';
 print '#include <glibtop/open.h>';
+print '#include <glibtop/xmalloc.h>';
 print '';
 print '#include <glibtop/sysdeps.h>';
 print '#include <glibtop/union.h>';
@@ -246,7 +247,7 @@ sub output {
  if ($line_fields[3] eq '') {
    $size_code .= "\t_LIBGTOP_RECV_buf = NULL;\n";
  } else {
-    $size_code .= "\t_LIBGTOP_RECV_buf = g_malloc (_LIBGTOP_RECV_len);\n";
+    $size_code .= "\t_LIBGTOP_RECV_buf = glibtop_malloc_r (server, _LIBGTOP_RECV_len);\n";
  }
  $size_code .= "\t_LIBGTOP_RECV_ptr = _LIBGTOP_RECV_buf;\n\n";

@@ -298,7 +299,7 @@ sub output {
    $recv_buf_code .= "\n";
    $recv_buf_code .= "\t_LIBGTOP_TEMP_len += sizeof (off_t) + 1;\n";
    $recv_buf_code .= "\t_LIBGTOP_TEMP_len += array.number * sizeof (off_t);\n";
-    $recv_buf_code .= "\t_LIBGTOP_ARRAY_base = g_malloc (_LIBGTOP_TEMP_len);";
+    $recv_buf_code .= "\t_LIBGTOP_ARRAY_base = glibtop_malloc_r (server, _LIBGTOP_TEMP_len);";
    $recv_buf_code .= "\t_LIBGTOP_ARRAY_ptr = _LIBGTOP_ARRAY_base;\n";
    $recv_buf_code .= "\t_LIBGTOP_ARRAY_offset = array.number * sizeof (off_t);\n";
    $recv_buf_code .= "\t_LIBGTOP_ARRAY_offset += sizeof (off_t);\n";
--- a/backends/server/marshal.pl
+++ b/backends/server/marshal.pl
@@ -181,7 +181,7 @@ sub output {
    $send_buf_code = "\t/* send buffer */\n";
    $send_buf_code .= "\t_LIBGTOP_SEND_buf = ";
    if ($need_temp_storage) {
-      $send_buf_code .= "g_malloc (_LIBGTOP_SEND_len+1)";
+      $send_buf_code .= "glibtop_malloc_r (server, _LIBGTOP_SEND_len+1)";
    } else {
      $send_buf_code .= '(void *) &'.$first_param_name;
    }
@@ -190,7 +190,7 @@ sub output {
    $send_buf_code .= "\t/* data buffer */\n";
    $send_buf_code .= "\t_LIBGTOP_DATA_buf = ";
    if ($need_temp_storage) {
-      $send_buf_code .= "g_malloc (_LIBGTOP_DATA_len+1)";
+      $send_buf_code .= "glibtop_malloc_r (server, _LIBGTOP_DATA_len+1)";
    } else {
      $send_buf_code .= 'NULL';
    }
@@ -216,8 +216,8 @@ sub output {
    $call_code .= sprintf ("\t\t\t%s%s);\n", $call_prefix_space, $retval_param);

    if ($need_temp_storage) {
-      $send_buf_free_code = "\tg_free (_LIBGTOP_SEND_buf);\n";
-      $send_buf_free_code .= "\tg_free (_LIBGTOP_DATA_buf);\n";
+      $send_buf_free_code = "\tglibtop_free_r (server, _LIBGTOP_SEND_buf);\n";
+      $send_buf_free_code .= "\tglibtop_free_r (server, _LIBGTOP_DATA_buf);\n";
    } else {
      $send_buf_free_code = "";
    }
@@ -231,14 +231,14 @@ sub output {
      $local_var_code .= "\tchar *_LIBGTOP_ARRAY_ptr, **ptrlist;\n";
      $local_var_code .= "\toff_t *_LIBGTOP_ARRAY_off_ptr;\n";
      $local_var_code .= "\tint i;\n";
-      $call_code .= "\tptrlist = g_malloc (array->number+1 * sizeof (char *));\n";
+      $call_code .= "\tptrlist = glibtop_calloc_r (server, array->number+1, sizeof (char *));\n";
      $call_code .= "\t_LIBGTOP_ARRAY_off_ptr = (off_t *) retval;\n";
      $call_code .= "\t_LIBGTOP_ARRAY_ptr = (char *) retval;\n";
      $call_code .= "\t_LIBGTOP_ARRAY_off_ptr++;\n\n";
      $call_code .= "\tfor (i = 0; i < array->number; i++)\n";
-      $call_code .= "\t\tptrlist [i] = g_strdup (_LIBGTOP_ARRAY_ptr + *_LIBGTOP_ARRAY_off_ptr++);\n";
+      $call_code .= "\t\tptrlist [i] = glibtop_strdup_r (server, _LIBGTOP_ARRAY_ptr + *_LIBGTOP_ARRAY_off_ptr++);\n";
      $call_code .= "\tptrlist [array->number] = NULL;\n\n";
-      $call_code .= "\tg_free (retval);\n";
+      $call_code .= "\tglibtop_free_r (server, retval);\n";
      $call_code .= "\tretval = ptrlist;\n";
    }

--- a/backends/server/read_data.c
+++ b/backends/server/read_data.c
@@ -45,10 +45,10 @@ glibtop_read_data_i (backend_server_private *priv)
    fprintf (stderr, "LIBRARY: really reading %d data bytes (ret = %d).\n", size, ret);
 #endif

-    if (!size) return NULL;
-
-    ptr = g_malloc (size);
+    if (!size) return NULL;	

+    ptr = glibtop_malloc_r (priv->server, size);
+	
    ret = read (priv->input [0], ptr, size);

    if (ret < 0)
--- a/backends/server/server.c
+++ b/backends/server/server.c
@@ -86,9 +86,10 @@ main(int argc, char *argv[])
    }

    server = glibtop_global_server;
-
+	
    if (!server->_priv)
-	server->_priv = g_malloc (sizeof (glibtop_server_private));
+	server->_priv = glibtop_calloc_r
+	    (server, 1, sizeof (glibtop_server_private));

    glibtop_init_p (server, 0, 0);

@@ -155,7 +156,7 @@ handle_slave_connection (int input, int output)
 		     cmnd->data_size);
 #endif

-	    data_ptr = g_malloc (cmnd->data_size);
+	    data_ptr = glibtop_malloc_r (server, cmnd->data_size);
 	    do_read (input, data_ptr, cmnd->data_size);
 	}

@@ -185,5 +186,5 @@ handle_slave_connection (int input, int output)
 	resp.data_size = recv_data_size;

 	do_output (output, &resp, recv_ptr, recv_data_ptr);
-    }
+    }		
 }
--- a/backends/server/server.h
+++ b/backends/server/server.h
@@ -31,6 +31,7 @@

 #include <glibtop/open.h>
 #include <glibtop/union.h>
+#include <glibtop/xmalloc.h>
 #include <glibtop/parameter.h>

 #include <fcntl.h>
@@ -43,7 +44,7 @@

 #include "command.h"

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 /* Some don't have LOG_PERROR */
 #ifndef LOG_PERROR
@@ -79,6 +80,6 @@ glibtop_send_version_i (glibtop *server, int fd);
 extern int enable_debug;
 extern int verbose_output;

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/backends/server/version.c
+++ b/backends/server/version.c
@@ -37,7 +37,7 @@ glibtop_send_version_i (glibtop *server, int fd)
 	     sizeof (glibtop_response),
 	     sizeof (glibtop_union),
 	     sizeof (glibtop_sysdeps));
-
+	
    size = strlen (buffer) + 1;

 #ifdef DEBUG
--- a/backends/sysdeps/ChangeLog
+++ b/backends/sysdeps/ChangeLog
@@ -1,11 +1,3 @@
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-sysdeps.c: (_open_sysdeps): s/u_int64_t/guint64/
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* backend-sysdeps.h: fixed compilation
-
 2000-11-26  Martin Baulig  <martin@home-of-linux.org>

 	* glibtop-backend-private.h: Removed.
--- a/backends/sysdeps/backend-sysdeps.c
+++ b/backends/sysdeps/backend-sysdeps.c
@@ -26,7 +26,7 @@
 #include <backend-sysdeps.h>

 static int
-_open_sysdeps (glibtop_server *, glibtop_backend *, guint64, const char **);
+_open_sysdeps (glibtop_server *, glibtop_backend *, u_int64_t, const char **);

 static int
 _close_sysdeps (glibtop_server *, glibtop_backend *, void *);
@@ -47,7 +47,7 @@ glibtop_backend_info LibGTopBackendInfo_Sysdeps = {

 static int
 _open_sysdeps (glibtop_server *server, glibtop_backend *backend,
-	       guint64 features, const char **backend_args)
+	       u_int64_t features, const char **backend_args)
 {
    glibtop_init_func_t *init_fkt;

@@ -60,7 +60,7 @@ _open_sysdeps (glibtop_server *server, glibtop_backend *backend,
 	    (*init_fkt) (server);

 	server->info->sysdeps.pointer_size = sizeof (void*)*8;
-
+		
 	server->flags |= _GLIBTOP_INIT_STATE_SYSDEPS;
    }

--- a/backends/sysdeps/backend-sysdeps.h
+++ b/backends/sysdeps/backend-sysdeps.h
@@ -30,6 +30,7 @@
 #include <glibtop/global.h>

 #include <glibtop/open.h>
+#include <glibtop/xmalloc.h>
 #include <glibtop/glibtop-backend.h>
 #include <glibtop/glibtop-backend-info.h>

--- a/configure.in
+++ b/configure.in
@@ -5,24 +5,22 @@ dnl
 AC_INIT(copyright.txt)
 AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
+# Making releases:
+#   LIBGTOP_MICRO_VERSION += 1;
+#   LIBGTOP_INTERFACE_AGE += 1;
+#   LIBGTOP_BINARY_AGE += 1;
+# if any functions have been added, set LIBGTOP_INTERFACE_AGE to 0.
+# if backwards compatibility has been broken,
+# set LIBGTOP_BINARY_AGE and LIBGTOP_INTERFACE_AGE to 0.
+#

 LIBGTOP_MAJOR_VERSION=2
-LIBGTOP_MINOR_VERSION=6
-LIBGTOP_MICRO_VERSION=1
+LIBGTOP_MINOR_VERSION=0
+LIBGTOP_MICRO_VERSION=8
 LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
 AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
-
-dnl  increment if the interface has additions, changes, removals.
-LIBGTOP_CURRENT=3
-
-dnl  increment any time the source changes; set to
-dnl  0 if you increment CURRENT
-LIBGTOP_REVISION=0
-
-dnl  increment if any interfaces have been added; set to 0
-dnl  if any interfaces have been removed. removal has
-dnl  precedence over adding, so set to 0 if both happened.
-LIBGTOP_AGE=1
+LIBGTOP_INTERFACE_AGE=8
+LIBGTOP_BINARY_AGE=8

 # you can set this to `-snap' for instance to create
 # a `libgtop-1.x.y-snap.tar.gz' tarball.
@@ -46,10 +44,10 @@ AC_SUBST(LIBGTOP_VERSION_SUFFIX)

 # libtool versioning
 LT_RELEASE=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION
-LT_CURRENT=$LIBGTOP_CURRENT
-LT_REVISION=$LIBGTOP_REVISION
-LT_AGE=$LIBGTOP_AGE
-LT_VERSION_INFO="-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}"
+LT_CURRENT=`expr $LIBGTOP_MICRO_VERSION - $LIBGTOP_INTERFACE_AGE`
+LT_REVISION=$LIBGTOP_INTERFACE_AGE
+LT_AGE=`expr $LIBGTOP_BINARY_AGE - $LIBGTOP_INTERFACE_AGE`
+LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}'
 AC_SUBST(LT_VERSION_INFO)
 AC_SUBST(LT_RELEASE)
 AC_SUBST(LT_CURRENT)
@@ -91,11 +89,46 @@ export cross_compiling

 AM_PROG_LIBTOOL

+dnl Let the user enable compiler warnings
+dnl GNOME_COMPILE_WARNINGS
+
+dnl GNOME_INIT_HOOK(gnome_found=yes)
+
+dnl if test "x$gnome_found" != xyes; then
+dnl   if test "x$want_gnome" != xno ; then
+dnl     AC_MSG_ERROR([
+dnl *** GNOME was not found on this system. ***
+dnl 
+dnl *** If you want to use LibGTop without GNOME, you need
+dnl *** to give configure the --without-gnome parameter.
+dnl ])
+dnl   else
+dnl     AC_DEFINE(WITHOUT_GNOME)
+dnl   fi
+dnl   GNOME_SUPPORT_CHECKS
+dnl else
+dnl   if test "x$want_gnome" != xno ; then
+dnl     AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
+dnl   else
+dnl     GNOME_SUPPORT_CHECKS
+dnl   fi
+dnl fi
+
+AM_CONDITIONAL(BUILD_GNOME_SUPPORT, false)
+
 AM_CONDITIONAL(CROSS_COMPILING, test "x$cross_compiling" = xyes)

 GNOME_LIBGTOP_SYSDEPS
 GNOME_LIBGTOP_TYPES

+dnl AC_ARG_WITH(libgtop-guile,
+dnl [  --with-libgtop-guile    Build the libgtop guile interface (default=no)],
+dnl [build_guile="$withval"], [build_guile=yes])
+
+dnl if test x$build_guile != xno ; then
+dnl  GNOME_CHECK_GUILE
+dnl fi
+
 AC_ARG_WITH(libgtop-inodedb,
 [  --with-libgtop-inodedb  Build the inodedb stuff (default=no)],
 [build_inodedb="$withval"], [build_inodedb=no])
@@ -114,6 +147,20 @@ fi

 AC_DEFINE(GLIBTOP_NAMES)

+if test x$ac_cv_guile_found = xyes ; then
+  AC_DEFINE(GLIBTOP_GUILE)
+  AC_DEFINE(GLIBTOP_GUILE_NAMES)
+  libgtop_guile_found=yes
+  guile_examples='third'
+  guile_static_examples='third_static'
+  guile_subdirs='guile'
+else
+  libgtop_guile_found=no
+  guile_examples=
+  guile_static_examples=
+  guile_subdirs=
+fi
+
 if test x$libgtop_smp = xyes ; then
  smp_examples='smp'
  smp_static_examples='smp_static'
@@ -123,7 +170,7 @@ else
 fi

 if test "x$enable_static" != xno; then
-  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $smp_static_examples"
+  static_targets="first_static second_static mountlist_static procmap_static netload_static sysdeps_static timings_static $guile_static_examples $smp_static_examples"
 else
  static_targets=""
 fi
@@ -133,6 +180,10 @@ AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)

 AC_SUBST(static_targets)
 AC_SUBST(smp_examples)
+AC_SUBST(guile_examples)
+AC_SUBST(guile_subdirs)
+
+AM_PROG_LIBTOOL

 GLIB_REQUIRED=2.0.0

@@ -140,13 +191,11 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)

-AC_CHECK_HEADER(popt.h,[POPT=yes],[POPT=no])
-AC_MSG_CHECKING(for popt.h)
-if test x$POPT = xyes ; then
-   AC_MSG_RESULT(yes)
-else
-   AC_MSG_ERROR([libgtop requires the popt development libraries])
-fi
+dnl (1.2.0,,AC_MSG_ERROR(GLIB >= 1.2.0 is required for LibGTop))
+
+dnl You need to uncomment the following line if you want to use
+dnl libGTop without Gnome.
+GNOME_SUPPORT_CHECKS

 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -180,14 +229,8 @@ AC_CHECK_FUNCS(dlerror,,)
 LIBS="$oLIBS"
 AC_SUBST(DL_LIB)

-dnl Linux
-AC_CHECK_HEADER(linux/isdn.h,[HAVE_ISDN_H=yes],[HAVE_ISDN_H=no])
-if test x$HAVE_ISDN_H = xyes ; then
-	AC_DEFINE(HAVE_ISDN_H, 1, [defined if you have linux/isdn.h])
-fi
-
 dnl AIX
-AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the 'vmgetinfo' function in libperfstat])
+AH_TEMPLATE(HAVE_VMGETINFO, [Define to 1 if you have the `vmgetinfo' function in libperfstat])
 AC_CHECK_LIB(perfstat, vmgetinfo, AC_DEFINE(HAVE_VMGETINFO))

 dnl Solaris
@@ -250,7 +293,7 @@ AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
 AC_CHECK_FUNCS(getcwd gettimeofday getwd putenv strdup strtoul uname)

-ALL_LINGUAS="am ar az be bg bn ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id it ja ko lt lv mk ml mn ms nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"
+ALL_LINGUAS="am ar az be bg bn ca cs cy da de el es et fa fi fr ga gl he hi hu id it ja ko lt lv mk ml mn ms nl nn no pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta tr uk vi zh_CN zh_TW"

 GETTEXT_PACKAGE=libgtop-2.0
 AC_SUBST(GETTEXT_PACKAGE)
@@ -296,6 +339,24 @@ dnl Debugging
 AC_ARG_ENABLE(debug, [  --enable-debug          turn on debugging [default=no]],AC_DEFINE(LIBGTOP_ENABLE_DEBUG),)
 AC_ARG_ENABLE(fatal-warnings, [  --enable-fatal-warnings make all warnings fatal [debug=no]],AC_DEFINE(LIBGTOP_FATAL_WARNINGS),)

+if test "x$gnome_found" = xyes ; then
+  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
+  SUPPORTINCS="$GNOME_INCLUDEDIR"
+else
+  LIBSUPPORT='$(top_builddir)/support/libgnomesupport-2.0.la'
+  SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support'
+fi
+
+dnl Some ugly hack; if '-lgnomesupport' is part of $GNOME_LIBS,
+dnl we include it here.
+case "$GNOME_LIBS" in
+	'*-lgnomesupport*' ) 
+	  LIBSUPPORT="$GNOME_LIBDIR -lgnomesupport"
+          SUPPORTINCS="$GNOME_INCLUDEDIR" ;;
+esac
+AC_SUBST(LIBSUPPORT)
+AC_SUBST(SUPPORTINCS)
+
 dnl These definitions are expanded in make.
 LIBGTOP_LIBS='-L$(libdir)'
 LIBGTOP_INCS='-I$(includedir)/libgtop-2.0'
@@ -316,14 +377,25 @@ if test x$libgtop_have_sysinfo = xyes ; then
  LIBGTOP_INCS="$LIBGTOP_INCS -DHAVE_LIBGTOP_SYSINFO"
 fi

-LIBGTOP_INCS="$LIBGTOP_INCS $GLIB_CFLAGS"
+LIBGTOP_INCS="$LIBGTOP_INCS $SUPPORTINCS $GLIB_CFLAGS"

+LIBGTOP_GUILE_LIBS="$LIBGTOP_LIBS"
+LIBGTOP_GUILE_INCS="$LIBGTOP_INCS"
 LIBGTOP_BINDIR='$(bindir)'
 LIBGTOP_SERVER='$(bindir)/libgtop_server2'

 sysdeps_dir="$libgtop_sysdeps_dir"
 AC_SUBST(sysdeps_dir)

+if test x$ac_cv_guile_found = xyes ; then
+  LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile-2.0"
+  libgtop_guile_found=yes
+else
+  libgtop_guile_found=no
+fi
+
+AC_SUBST(libgtop_guile_found)
+
 if test -z "$LIBGTOP_EXTRA_LIBS" ; then
  LIBGTOP_EXTRA_LIBS="$libs_xauth"
 else
@@ -332,29 +404,35 @@ fi

 LIBGTOP_EXTRA_LIBS="$LIBGTOP_EXTRA_LIBS $GLIB_LIBS"

-LIBGTOP_LIBS="$LIBGTOP_LIBS"
-LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS"
+LIBGTOP_LIBS="$LIBGTOP_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS -lgtop-2.0 -lgtop_sysdeps-2.0 -lgtop_common-2.0"
+
+LIBGTOP_NAMES_LIBS="$LIBGTOP_LIBS -lgtop_names-2.0"
+LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_LIBS -lgtop_guile_names-2.0 -lgtop_names-2.0"

 LIBGTOP_LIBS="$LIBGTOP_LIBS" 
 LIBGTOP_NAMES_LIBS="$LIBGTOP_NAMES_LIBS"
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS"
+LIBGTOP_GUILE_NAMES_LIBS="$LIBGTOP_GUILE_NAMES_LIBS"
+
+LIBGTOP_GUILE_LIBS="$LIBGTOP_GUILE_LIBS $GUILE_LIBS"
+LIBGTOP_GUILE_INCS="$LIBGTOP_GUILE_INCS $GUILE_INCS -DGLIBTOP_GUILE"

 LIBGTOP_NAMES_INCS="$LIBGTOP_INCS -DGLIBTOP_NAMES"
+LIBGTOP_GUILE_NAMES_INCS="$LIBGTOP_GUILE_INCS -DGLIBTOP_GUILE_NAMES"
+LIBGTOP_GUILE_NAMES_INCS="$LIBGTOP_GUILE_INCS -DGLIBTOP_NAMES"

 machine_incs="-I\$(top_srcdir)/sysdeps/$sysdeps_dir"

 AC_SUBST(machine_incs)

-if test "$GCC" = "yes" ; then
-        CFLAGS="\
-	-Wall \
-	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
-	-Wnested-externs -Wpointer-arith \
-	-Wcast-align -Wsign-compare \
-	-fno-strict-aliasing \
-	$CFLAGS"
+if test x$libgtop_guile_found = xyes ; then
+  guile_def="-DGLIBTOP_GUILE -DGLIBTOP_GUILE_NAMES $GUILE_INCS "
+else
+  guile_def=""
 fi

-INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $GLIB_CFLAGS $CFLAGS $X_CFLAGS "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'
+INCLUDES="-D_IN_LIBGTOP -D_GNU_SOURCE -DGLIBTOP_NAMES -I\$(top_builddir) -I\$(top_srcdir) -I\$(top_srcdir)/sysdeps/$sysdeps_dir -I\$(top_srcdir)/include $SUPPORTINCS $GLIB_CFLAGS $CFLAGS $X_CFLAGS $guile_def "'-DGTOPLOCALEDIR=\"$(datadir)/locale\" -DLIBGTOP_VERSION=\"'"$LIBGTOP_VERSION"'\" -DLIBGTOP_SERVER_VERSION=\"'"$LIBGTOP_SERVER_VERSION"'\" -DLIBGTOP_VERSION_CODE='$LIBGTOP_VERSION_CODE' -DLIBGTOP_SERVER=\"'"$LIBGTOP_SERVER"'\"'

 AC_SUBST(INCLUDES)

@@ -364,6 +442,10 @@ AC_SUBST(LIBGTOP_LIBS)
 AC_SUBST(LIBGTOP_INCS)
 AC_SUBST(LIBGTOP_NAMES_LIBS)
 AC_SUBST(LIBGTOP_NAMES_INCS)
+AC_SUBST(LIBGTOP_GUILE_LIBS)
+AC_SUBST(LIBGTOP_GUILE_INCS)
+AC_SUBST(LIBGTOP_GUILE_NAMES_LIBS)
+AC_SUBST(LIBGTOP_GUILE_NAMES_INCS)
 AC_SUBST(LIBGTOP_BINDIR)
 AC_SUBST(LIBGTOP_SERVER)

@@ -387,6 +469,8 @@ include/glibtop/Makefile
 sysdeps/Makefile
 sysdeps/common/Makefile
 sysdeps/names/Makefile
+sysdeps/guile/Makefile
+sysdeps/guile/names/Makefile
 sysdeps/stub/Makefile
 sysdeps/stub_suid/Makefile
 sysdeps/sun4/Makefile
@@ -402,5 +486,7 @@ src/inodedb/Makefile
 lib/Makefile
 examples/Makefile
 doc/Makefile
+support/Makefile
+support/gnome-support-2.0.pc
 libgtop-2.0.pc
 ])
--- a/doc/.cvsignore
+++ b/doc/.cvsignore
@@ -8,4 +8,3 @@ auto-macros.texi
 version.texi
 stamp-vti
 *.html *.pdf
-mdate-sh
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,15 +1,3 @@
-2004-03-05  Bastien Nocera  <hadess@hadess.net>
-
-	* reference.texi: update for new API
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* reference.texi: s/u_int64_t/guint64/
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am: removed traces of guile, intllibs and libgnomesupport
-
 2002-03-12  James Henstridge  <james@daa.com.au>

 	* Makefile.am (MAKEINFO): using += seems to screw up the build
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -18,6 +18,10 @@ auto-macros.texi: auto-macros.texi.in Makefile
 	  -e 's#\%LIBGTOP_INCS\%#$(LIBGTOP_INCS)#g' \
 	  -e 's#\%LIBGTOP_NAMES_LIBS\%#$(LIBGTOP_NAMES_LIBS)#g' \
 	  -e 's#\%LIBGTOP_NAMES_INCS\%#$(LIBGTOP_NAMES_INCS)#g' \
+	  -e 's#\%LIBGTOP_GUILE_LIBS\%#$(LIBGTOP_GUILE_LIBS)#g' \
+	  -e 's#\%LIBGTOP_GUILE_INCS\%#$(LIBGTOP_GUILE_INCS)#g' \
+	  -e 's#\%LIBGTOP_GUILE_NAMES_LIBS\%#$(LIBGTOP_GUILE_NAMES_LIBS)#g' \
+	  -e 's#\%LIBGTOP_GUILE_NAMES_INCS\%#$(LIBGTOP_GUILE_NAMES_INCS)#g' \
 	  -e 's#\%LIBGTOP_BINDIR\%#$(LIBGTOP_BINDIR)#g' \
 	  -e 's#\%LIBGTOP_SERVER\%#$(LIBGTOP_SERVER)#g' \
 	  -e 's#\%LIBGTOP_MAJOR_VERSION\%#$(LIBGTOP_MAJOR_VERSION)#g' \
@@ -29,6 +33,7 @@ auto-macros.texi: auto-macros.texi.in Makefile
 	  -e 's#\%libgtop_sysdeps_dir\%#$(libgtop_sysdeps_dir)#g' \
 	  -e 's#\%libgtop_need_server\%#$(libgtop_need_server)#g' \
 	  -e 's#\%libgtop_use_machine_h\%#$(libgtop_use_machine_h)#g' \
+	  -e 's#\%libgtop_guile_found\%#$(libgtop_guile_found)#g' \
 	  -e 's#\%libgtop_want_examples\%#$(libgtop_want_examples)#g' \
 	      < $(srcdir)/auto-macros.texi.in > auto-macros.tmp
 	echo '@c Set this if this is LibGTop 1.1.x' >> auto-macros.tmp
--- a/doc/reference.texi
+++ b/doc/reference.texi
@@ -50,7 +50,7 @@ typedef struct _glibtop_cpu     glibtop_cpu;

 struct _glibtop_cpu
@{
-    guint64   flags,
+    u_int64_t   flags,
        total,
        user,
        nice,
@@ -139,7 +139,7 @@ typedef struct _glibtop_mem     glibtop_mem;

 struct _glibtop_mem
@{
-    guint64   flags,
+    u_int64_t   flags,
        total,
        used,
        free,
@@ -207,7 +207,7 @@ typedef struct _glibtop_swap    glibtop_swap;

 struct _glibtop_swap
@{
-    guint64   flags,
+    u_int64_t   flags,
        total,
        used,
        free,
@@ -266,10 +266,10 @@ typedef struct _glibtop_uptime  glibtop_uptime;

 struct _glibtop_uptime
@{
-    guint64 flags;
+    u_int64_t flags;
    double uptime,
        idletime;
-    guint64 boot_time;
+    u_int64_t boot_time;
@};
@end cartouche
@end example
@@ -318,9 +318,9 @@ typedef struct _glibtop_loadavg glibtop_loadavg;

 struct _glibtop_loadavg
@{
-    guint64 flags;
+    u_int64_t flags;
    double loadavg [3];
-    guint64 nr_running,
+    u_int64_t nr_running,
        nr_tasks,
        last_pid;
@};
@@ -395,7 +395,7 @@ typedef struct _glibtop_proclist        glibtop_proclist;

 struct _glibtop_proclist
@{
-    guint64   flags,
+    u_int64_t   flags,
        number,
        total,
        size;
@@ -464,8 +464,8 @@ Size of a single entry in the returned list
 (this equals @code{sizeof (unsigned)}).
@end table

-The returned list is allocated using @code{g_malloc} and must be freed
-using @code{g_free} to avoid a memory leak.
+The returned list is allocated using @code{glibtop_malloc} and must be freed
+using @code{glibtop_free} to avoid a memory leak.

@page
@node glibtop_proc_state, glibtop_proc_uid, glibtop_proclist, System Dependent
@@ -492,7 +492,7 @@ typedef struct _glibtop_proc_state      glibtop_proc_state;

 struct _glibtop_proc_state
@{
-    guint64 flags;
+    u_int64_t flags;
    char cmd[40];
@ifset LIBGTOP-1-1
    unsigned state;
@@ -618,7 +618,7 @@ typedef struct _glibtop_proc_uid        glibtop_proc_uid;

 struct _glibtop_proc_uid
@{
-    guint64 flags;
+    u_int64_t flags;
    int uid,
        euid,
        gid,
@@ -698,7 +698,7 @@ typedef struct _glibtop_proc_mem        glibtop_proc_mem;

 struct _glibtop_proc_mem
@{
-    guint64   flags,
+    u_int64_t   flags,
        size,
        vsize,
        resident,
@@ -813,7 +813,7 @@ typedef struct _glibtop_proc_time       glibtop_proc_time;

 struct _glibtop_proc_time
@{
-    guint64   flags,
+    u_int64_t   flags,
        start_time,
        rtime,
        utime,
@@ -881,7 +881,7 @@ typedef struct _glibtop_proc_signal     glibtop_proc_signal;

 struct _glibtop_proc_signal
@{
-    guint64   flags,
+    u_int64_t   flags,
        signal [2],
        blocked [2],
        sigignore [2],
@@ -902,7 +902,7 @@ Mask of caught signals
@end table

 All signal masks are interpreted as bit mask; it is an array of two
-@code{guint64}'s so we can save 128 signals there.
+@code{u_int64_t}'s so we can save 128 signals there.

@page
@node glibtop_proc_kernel, glibtop_proc_segment, glibtop_proc_signal, System Dependent
@@ -929,8 +929,8 @@ typedef struct _glibtop_proc_kernel     glibtop_proc_kernel;

 struct _glibtop_proc_kernel
@{
-    guint64 flags;
-    guint64 k_flags,
+    u_int64_t flags;
+    u_int64_t k_flags,
        min_flt,
        maj_flt,
        cmin_flt,
@@ -1029,7 +1029,7 @@ typedef struct _glibtop_proc_segment    glibtop_proc_segment;

 struct _glibtop_proc_segment
@{
-    guint64   flags,
+    u_int64_t   flags,
        text_rss,
        shlib_rss,
        data_rss,
@@ -1096,7 +1096,7 @@ typedef struct _glibtop_proc_args       glibtop_proc_args;

 struct _glibtop_proc_args
@{
-    guint64   flags,
+    u_int64_t   flags,
        size;
@};
@end cartouche
@@ -1108,7 +1108,7 @@ Returns a string with all command line arguments of process @code{pid}
 The command line arguments in the returned string are separated by zero bytes;
 the lenght of this string is returned in the @code{size} field.

-Remember to @code{g_free} the returned string to avoid a memory leak.
+Remember to @code{glibtop_free} the returned string to avoid a memory leak.

@page
@node glibtop_proc_map, glibtop_netload, glibtop_proc_args, System Dependent
@@ -1135,7 +1135,7 @@ typedef struct _glibtop_proc_map        glibtop_proc_map;

 struct _glibtop_proc_map
@{
-    guint64   flags,
+    u_int64_t   flags,
        number,
        total,
        size;
@@ -1144,7 +1144,7 @@ struct _glibtop_proc_map
@end example

 Returns a @code{glibtop_map_entry *} list (which needs to be freed with
-@code{g_free}) of memory maps of process @code{pid}.
+@code{glibtop_free}) of memory maps of process @code{pid}.

@table @code
@item number
@@ -1164,7 +1164,7 @@ typedef struct _glibtop_map_entry       glibtop_map_entry;

 struct _glibtop_map_entry
@{
-    guint64 flags, start, end, offset, perm, inode, device;
+    u_int64_t flags, start, end, offset, perm, inode, device;
    char filename [GLIBTOP_MAP_FILENAME_LEN+1];
@};
@end cartouche
@@ -1175,13 +1175,13 @@ fields are valid:

@example
@cartouche
-#define GLIBTOP_MAP_ENTRY_START         0
-#define GLIBTOP_MAP_ENTRY_END           1
-#define GLIBTOP_MAP_ENTRY_OFFSET        2
-#define GLIBTOP_MAP_ENTRY_PERM          3
-#define GLIBTOP_MAP_ENTRY_INODE         4
-#define GLIBTOP_MAP_ENTRY_DEVICE        5
-#define GLIBTOP_MAP_ENTRY_FILENAME      6
+#define GLIBTOP_MAP_ENTRY_START         1
+#define GLIBTOP_MAP_ENTRY_END           2
+#define GLIBTOP_MAP_ENTRY_OFFSET        3
+#define GLIBTOP_MAP_ENTRY_PERM          4
+#define GLIBTOP_MAP_ENTRY_INODE         5
+#define GLIBTOP_MAP_ENTRY_DEVICE        6
+#define GLIBTOP_MAP_ENTRY_FILENAME      7
@end cartouche
@end example

@@ -1222,7 +1222,7 @@ typedef struct _glibtop_netload glibtop_netload;

 struct _glibtop_netload
@{
-    guint64   flags,
+    u_int64_t   flags,
        if_flags,
        mtu,
        subnet,
@@ -1329,7 +1329,7 @@ typedef struct _glibtop_ppp     glibtop_ppp;

 struct _glibtop_ppp
@{
-    guint64   flags,
+    u_int64_t   flags,
        state,
        bytes_in,
        bytes_out;
@@ -1409,7 +1409,7 @@ typedef struct _glibtop_mountlist       glibtop_mountlist;

 struct _glibtop_mountlist
@{
-    guint64   flags,
+    u_int64_t   flags,
        number,
        total,
        size;
@@ -1418,7 +1418,7 @@ struct _glibtop_mountlist
@end example

 Returns a @code{glibtop_mountentry *} list (which needs to be freed with
-@code{g_free}) of mounted filesystems.
+@code{glibtop_free}) of mounted filesystems.

@table @code
@item number
@@ -1438,7 +1438,7 @@ typedef struct _glibtop_mountentry      glibtop_mountentry;

 struct _glibtop_mountentry
@{
-    guint64 dev;
+    u_int64_t dev;
    char devname [GLIBTOP_MOUNTENTRY_LEN+1];
    char mountdir [GLIBTOP_MOUNTENTRY_LEN+1];
    char type [GLIBTOP_MOUNTENTRY_LEN+1];
@@ -1488,7 +1488,7 @@ typedef struct _glibtop_fsusage         glibtop_fsusage;

 struct _glibtop_fsusage
@{
-    guint64   flags,
+    u_int64_t   flags,
        blocks,
        bfree,
        bavail,
@@ -1639,7 +1639,7 @@ typedef struct _glibtop_sysdeps         glibtop_sysdeps;

 struct _glibtop_sysdeps
@{
-    guint64 flags,
+    u_int64_t flags,
        features,
        pointer_size,
        cpu,
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,35 +1,3 @@
-2003-12-27  Ole Laursen  <olau@hardworking.dk>
-
-	* mountlist.c: Updated to display block size too.
-
-2004-03-04  Bastien Nocera  <hadess@hadess.net>
-
-	* smp.c: use libgtop-i18n.h
-
-2003-10-21  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am:
-	* smp.c:
-	* sysdeps.c: (main): install only one library, libgtop-2.0
-	Fix build-time warnings due to the redefinition of guint64
-	Fix building smp.c and sysdeps.c
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* first.c:
-	* mountlist.c:
-	* netload.c:
-	* procmap.c:
-	* second.c:
-	* smp.c:
-	* sysdeps.c:
-	* third.c:
-	* timings.c: fixed compilation
-
-2003-10-20  Bastien Nocera  <hadess@hadess.net>
-
-	* Makefile.am: removed traces of guile, intllibs and libgnomesupport
-
 2001-01-14  Abel Cheung  <maddog@linux.org.hk>

 	* \*.c: bindtextdomain and textdomain uses GETTEXT_PACKAGE.
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -6,9 +6,14 @@ INCLUDES		= @INCLUDES@

 DEFS			= @DEFS@

-noinst_PROGRAMS	= 	first second\
+# We install it in `libexec' since this will make it more easy
+# to put the examples into an extra RPM package.
+
+libgtopdir		= $(libexecdir)/libgtop
+
+libgtop_PROGRAMS	= first second\
 			  mountlist procmap netload sysdeps timings \
-			  @static_targets@ @smp_examples@
+			  @static_targets@ @guile_examples@ @smp_examples@

 EXTRA_PROGRAMS		= first_static second_static \
 			  mountlist_static procmap_static \
@@ -17,53 +22,77 @@ EXTRA_PROGRAMS		= first_static second_static \
 			  timings_static

 first_SOURCES		= first.c
-first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+first_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+			  @LIBSUPPORT@ @INTLLIBS@

 first_static_SOURCES	= $(first_SOURCES)
 first_static_LDADD	= $(first_LDADD)
 first_static_LDFLAGS	= -static

 second_SOURCES		= second.c
-second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+second_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+			  @LIBSUPPORT@ @INTLLIBS@

 second_static_SOURCES	= $(second_SOURCES)
 second_static_LDADD	= $(second_LDADD)
 second_static_LDFLAGS	= -static

 procmap_SOURCES		= procmap.c
-procmap_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+procmap_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+			  @LIBSUPPORT@ @INTLLIBS@
+
+

 procmap_static_SOURCES	= $(procmap_SOURCES)
 procmap_static_LDADD	= $(procmap_LDADD)
 procmap_static_LDFLAGS	= -static

 netload_SOURCES		= netload.c
-netload_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+netload_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+			  @LIBSUPPORT@ @INTLLIBS@

 netload_static_SOURCES	= $(netload_SOURCES)
 netload_static_LDADD	= $(netload_LDADD)
 netload_static_LDFLAGS	= -static

 sysdeps_SOURCES		= sysdeps.c
-sysdeps_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+sysdeps_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+			  @LIBSUPPORT@ @INTLLIBS@

 sysdeps_static_SOURCES	= $(sysdeps_SOURCES)
 sysdeps_static_LDADD	= $(sysdeps_LDADD)
 sysdeps_static_LDFLAGS	= -static

+third_guile_names_LIBS	= $(top_builddir)/sysdeps/guile/names/libgtop_guile_names-2.0.la
 third_names_LIBS	= $(top_builddir)/sysdeps/names/libgtop_names-2.0.la

 third_SOURCES		= third.c
-third_LDADD		= $(third_names_LIBS) \
+third_LDADD		= $(top_builddir)/sysdeps/guile/libgtop_guile-2.0.la \
+			  $(third_guile_names_LIBS) $(third_names_LIBS) \
 			  $(top_builddir)/lib/libgtop-2.0.la \
-			  @INTLLIBS@
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+			  @GUILE_LIBS@ @LIBSUPPORT@ @INTLLIBS@

 third_static_SOURCES	= $(third_SOURCES)
 third_static_LDADD	= $(third_LDADD)
 third_static_LDFLAGS	= -static

 mountlist_SOURCES	= mountlist.c
-mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+mountlist_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+			  @LIBSUPPORT@ @INTLLIBS@

 mountlist_static_SOURCES= $(mountlist_SOURCES)
 mountlist_static_LDADD	= $(mountlist_LDADD)
@@ -71,14 +100,20 @@ mountlist_static_LDFLAGS= -static


 smp_SOURCES		= smp.c
-smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+smp_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+			  @LIBSUPPORT@ @INTLLIBS@

 smp_static_SOURCES	= $(smp_SOURCES)
 smp_static_LDADD	= $(smp_LDADD)
 smp_static_LDFLAGS	= -static

 timings_SOURCES		= timings.c
-timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la
+timings_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
+			  $(top_builddir)/sysdeps/common/libgtop_common-2.0.la \
+			  $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la \
+			  @LIBSUPPORT@ @INTLLIBS@

 timings_static_SOURCES	= $(timings_SOURCES)
 timings_static_LDADD	= $(timings_LDADD)
--- a/examples/first.c
+++ b/examples/first.c
@@ -22,12 +22,11 @@
 */

 #include <locale.h>
-#include <libintl.h>
-#include <stdio.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>

 #include <glibtop/parameter.h>

@@ -55,7 +54,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-
+	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -135,7 +134,7 @@ main (int argc, char *argv [])

 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_shm_limits (&data.shm_limits);
-
+	
 	printf ("Shm Limits   (0x%08lx): %lu, %lu, %lu, %lu, %lu\n",
 		(unsigned long) data.shm_limits.flags,
 		(unsigned long) data.shm_limits.shmmax,
@@ -159,7 +158,7 @@ main (int argc, char *argv [])

 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_sem_limits (&data.sem_limits);
-
+	
 	printf ("Sem Limits   (0x%08lx): "
 		"%lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu, %lu\n",
 		(unsigned long) data.sem_limits.flags,
@@ -217,7 +216,7 @@ main (int argc, char *argv [])
 		(unsigned long) sysdeps.ppp);

 	printf ("\n");
-
+	
 	ptr = glibtop_get_proclist (&data.proclist, 0, 0);

 	printf ("Proclist     (0x%08lx): %lu, %lu, %lu\n",
@@ -233,7 +232,7 @@ main (int argc, char *argv [])
 		printf ("\n");
 	}

-	g_free (ptr);
+	glibtop_free (ptr);

 	pid = getpid ();
 	ppid = getppid ();
@@ -308,7 +307,7 @@ main (int argc, char *argv [])

 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, pid);
-
+	
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,
@@ -347,7 +346,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_args.size,
 		args ? args : "");

-	g_free (args);
+	glibtop_free (args);

 	printf ("\n");

@@ -457,7 +456,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_args.size,
 		args ? args : "");

-	g_free (args);
+	glibtop_free (args);

 	printf ("\n");

@@ -568,7 +567,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_args.size,
 		args ? args : "");

-	g_free (args);
+	glibtop_free (args);

 	glibtop_close ();

--- a/examples/mountlist.c
+++ b/examples/mountlist.c
@@ -22,12 +22,11 @@
 */

 #include <locale.h>
-#include <libintl.h>
-#include <stdio.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>

 #include <glibtop/parameter.h>

@@ -50,11 +49,11 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-
+	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
-
+	
 	printf ("Method = %d\n", method);

 	count = glibtop_get_parameter (GLIBTOP_PARAM_COMMAND, buffer, BUFSIZ);
@@ -74,7 +73,7 @@ main (int argc, char *argv [])
 	for (c = 0; c < PROFILE_COUNT; c++) {
 		mount_entries = glibtop_get_mountlist (&mount_list, 1);

-		g_free (mount_entries);
+		glibtop_free (mount_entries);
 	}

 	printf ("sbrk (0) = %p\n\n", sbrk (0));
@@ -90,21 +89,21 @@ main (int argc, char *argv [])
 			mount_entries [index].type,
 			mount_entries [index].devname);

-	printf ("\n\n%-16s %9s %9s %9s %9s %9s %9s\n",
-		"Mount", "Blocks", "Free", "Avail", "Files", "Free", "BlockSz");
+	printf ("\n\n%-23s %9s %9s %9s %9s %9s\n\n",
+		"", "Blocks", "Free", "Avail", "Files", "Free");

 	for (index = 0; index < mount_list.number; index++) {
 		glibtop_get_fsusage (&fsusage,
 				     mount_entries [index].mountdir);

-		printf ("%-16s %9Lu %9Lu %9Lu %9Lu %9Lu %9d\n",
+		printf ("Usage: %-16s %9Lu %9Lu %9Lu %9Lu %9Lu\n",
 			mount_entries [index].mountdir,
 			fsusage.blocks, fsusage.bfree,
 			fsusage.bavail, fsusage.files,
-			fsusage.ffree, fsusage.block_size);
+			fsusage.ffree);
 	}

-	g_free (mount_entries);
+	glibtop_free (mount_entries);

 	printf ("\nsbrk (0) = %p\n\n", sbrk (0));

--- a/examples/netload.c
+++ b/examples/netload.c
@@ -22,12 +22,11 @@
 */

 #include <locale.h>
-#include <libintl.h>
-#include <stdio.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>

 #include <glibtop/parameter.h>

@@ -54,7 +53,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-
+	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -77,14 +76,14 @@ main (int argc, char *argv [])

 	if (argc != 2)
 		glibtop_error ("Usage: %s interface", argv [0]);
-
+	
 	glibtop_get_netload (&netload, argv [1]);

 	addr.s_addr = netload.address;
 	subnet.s_addr = netload.subnet;

-	address_string = g_strdup (inet_ntoa (addr));
-	subnet_string  = g_strdup (inet_ntoa (subnet));
+	address_string = glibtop_strdup (inet_ntoa (addr));
+	subnet_string  = glibtop_strdup (inet_ntoa (subnet));

 	printf ("Network Load (0x%08lx):\n\n"
 		"\tInterface Flags:\t0x%08lx\n"
@@ -117,8 +116,8 @@ main (int argc, char *argv [])
 		(unsigned long) netload.errors_out,
 		(unsigned long) netload.errors_total);

-	g_free (address_string);
-	g_free (subnet_string);
+	glibtop_free (address_string);
+	glibtop_free (subnet_string);

 	glibtop_close ();

--- a/examples/procargs.c
+++ b/examples/procargs.c
@@ -1,30 +0,0 @@
-#include <glibtop/procargs.h>
-
-#include <stdlib.h>
-
-#include <unistd.h>
-
-int main(int argc, char **argv)
-{
-  while(*++argv)
-    {
-      glibtop_proc_args buf;
-      pid_t pid = strtol(*argv, NULL, 10);
-      char ** const pargv = glibtop_get_proc_argv(&buf, pid, 20);
-
-      char **parg = pargv;
-
-      printf("<%ld>\t", (long)pid);
-
-      while(*parg)
-	{
-	  printf("\"%s\"\t", *parg);
-	  parg++;
-	}
-
-      putchar('\n');
-
-      g_strfreev(pargv);
-    }
-}
-
--- a/examples/procmap.c
+++ b/examples/procmap.c
@@ -22,12 +22,11 @@
 */

 #include <locale.h>
-#include <libintl.h>
-#include <stdio.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>

 #include <glibtop/parameter.h>

@@ -61,7 +60,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-
+	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -97,7 +96,7 @@ main (int argc, char *argv [])
 		const char *filename = NULL;
 		unsigned device, device_major, device_minor;
 		char perm [5];
-
+		
 		if (maps [i].flags & (1L << GLIBTOP_MAP_ENTRY_FILENAME))
 			filename = maps [i].filename;

@@ -154,10 +153,10 @@ main (int argc, char *argv [])
 		}

 		if (filename && (filename != maps [i].filename))
-			g_free ((void*)filename);
+			glibtop_free (filename);
 	}

-	g_free (maps);
+	glibtop_free (maps);

 	glibtop_close ();

--- a/examples/second.c
+++ b/examples/second.c
@@ -23,12 +23,11 @@

 #include <locale.h>
 #include <math.h>
-#include <stdio.h>
-#include <libintl.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>

 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>
@@ -46,11 +45,11 @@ output (pid_t pid)
 	double b_total, b_utime, b_stime;
 	double s_total, s_utime, s_stime;
 	double my_utime, my_stime;
-	unsigned int ncpu;
+	int ncpu;
 #endif

 	printf ("\n");
-
+		
 	glibtop_get_proc_state (&data.proc_state, pid);

 	printf ("Proc_State   PID  %5d (0x%08lx): "
@@ -59,9 +58,9 @@ output (pid_t pid)
 		data.proc_state.cmd, data.proc_state.state,
 		(unsigned long) data.proc_state.uid,
 		(unsigned long) data.proc_state.gid);
-
+		
 	glibtop_get_proc_uid (&data.proc_uid, pid);
-
+	
 	printf ("Proc_Uid     PID  %5d (0x%08lx): "
 		"%d %d %d %d %d %d %d %d %d %d %d %d\n", (int) pid,
 		(unsigned long) data.proc_uid.flags,
@@ -73,7 +72,7 @@ output (pid_t pid)
 		data.proc_uid.priority, data.proc_uid.nice);

 	glibtop_get_proc_mem (&data.proc_mem, pid);
-
+		
 	printf ("Proc_Mem     PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_mem.flags,
@@ -83,7 +82,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_mem.share,
 		(unsigned long) data.proc_mem.rss,
 		(unsigned long) data.proc_mem.rss_rlim);
-
+		
 	glibtop_get_proc_segment (&data.proc_segment, pid);

 	printf ("Proc_Segment PID  %5d (0x%08lx): "
@@ -99,7 +98,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_segment.start_stack);

 	glibtop_get_proc_time (&data.proc_time, pid);
-
+		
 	printf ("Proc_Time    PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu %lu %lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_time.flags,
@@ -114,7 +113,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_time.frequency);

 	glibtop_get_proc_signal (&data.proc_signal, pid);
-
+	
 	printf ("Proc_Signal  PID  %5d (0x%08lx): "
 		"%lu %lu %lu %lu\n", (int) pid,
 		(unsigned long) data.proc_signal.flags,
@@ -152,7 +151,7 @@ output (pid_t pid)
 		(unsigned long) data.proc_args.size,
 		args ? args : "");

-	g_free (args);
+	glibtop_free (args);

 	printf ("\n");

@@ -160,7 +159,7 @@ output (pid_t pid)
 	ncpu = glibtop_global_server->ncpu;

 	glibtop_get_proc_time (&data.proc_time, pid);
-
+		
 	total = (unsigned long) data.proc_time.utime +
 		(unsigned long) data.proc_time.stime;

@@ -242,7 +241,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-
+	
 	glibtop_init ();

 	glibtop_get_sysdeps (&sysdeps);
@@ -288,11 +287,11 @@ main (int argc, char *argv [])
 	for (i = 0; i < proclist.number; i++) {

 		pid = ptr [i];
-
+		
 		output (pid);
 	}

-	g_free (ptr);
+	glibtop_free (ptr);

 	exit (0);
 }
--- a/examples/smp.c
+++ b/examples/smp.c
@@ -21,17 +21,12 @@
   Boston, MA 02111-1307, USA.
 */

-#include <config.h>
-
 #include <locale.h>
-#include <libintl.h>
 #include <math.h>
-#include <stdio.h>

 #include <glibtop.h>
 #include <glibtop/cpu.h>
-
-#include "libgtop-i18n.h"
+#include <glibtop/xmalloc.h>

 int
 main (int argc, char *argv [])
@@ -47,7 +42,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-
+	
 	glibtop_init();

 	glibtop_get_cpu (&cpu);
@@ -102,7 +97,7 @@ main (int argc, char *argv [])
 	printf ("%-26s %12s %12s %12s %12s %12s\n%s\n", _("Percent:"),
 		_("Total (%)"), _("User (%)"), _("Nice (%)"), _("Sys (%)"),
 		_("Idle (%)"), separator);
-
+	
 	printf (_("CPU          (0x%08lx): %12.3f %12.3f %12.3f %12.3f %12.3f\n\n"),
 		(unsigned long) cpu.flags, (double) total * 100.0 / total,
 		(double) user  * 100.0 / total,
--- a/examples/sysdeps.c
+++ b/examples/sysdeps.c
@@ -22,13 +22,11 @@
 */

 #include <locale.h>
-#include <libintl.h>
-#include <stdio.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
-#include <glibtop/sysdeps.h>
+#include <glibtop/xmalloc.h>

 #include <glibtop/parameter.h>

@@ -48,7 +46,7 @@ main (int argc, char *argv [])
 	setlocale (LC_ALL, "");
 	bindtextdomain (GETTEXT_PACKAGE, GTOPLOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
-
+	
 	glibtop_init_r (&glibtop_global_server, 0, GLIBTOP_INIT_NO_OPEN);

 	glibtop_get_parameter (GLIBTOP_PARAM_METHOD, &method, sizeof (method));
@@ -71,7 +69,7 @@ main (int argc, char *argv [])

 	glibtop_get_sysdeps (&sysdeps);

-#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f)) ? 1 : 0)
+#define FEATURE_CHECK(f) ((sysdeps.features & (1L << GLIBTOP_SYSDEPS_##f##)) ? 1 : 0)

 	printf ("Sysdeps (0x%08lx):\n\n"
 		"\tfeatures:\t\t0x%08lx\n\n"
--- a/examples/third.c
+++ b/examples/third.c
@@ -22,20 +22,19 @@
 */

 #include <locale.h>
-#include <libintl.h>
-#include <stdio.h>

 #include <glibtop.h>
-
+     
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>

 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>

 void main_prog(int argc, char *argv[]);

-int
+int     
 main (int argc, char *argv[])
 {
 	setlocale (LC_ALL, "");
--- a/examples/timings.c
+++ b/examples/timings.c
@@ -22,12 +22,11 @@
 */

 #include <locale.h>
-#include <stdio.h>
-#include <libintl.h>

 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
+#include <glibtop/xmalloc.h>

 #include <glibtop/parameter.h>

@@ -87,7 +86,7 @@ main (int argc, char *argv [])
 		"Feature", "Flags", "Count", "utime", "stime");
 	printf ("-------------------------------------------"
 		"---------------\n");
-
+	
 	glibtop_init_r (&glibtop_global_server, 0, 0);

 	getrusage (RUSAGE_SELF, &total_start);
@@ -188,7 +187,7 @@ main (int argc, char *argv [])

 	for (c = 0; c < PROFILE_COUNT_EXPENSIVE; c++) {
 		ptr = glibtop_get_proclist (&data.proclist, 0, 0);
-		g_free (ptr);
+		glibtop_free (ptr);
 	}

 	getrusage (RUSAGE_SELF, &rusage_end);
@@ -303,7 +302,7 @@ main (int argc, char *argv [])

 	for (c = 0; c < PROFILE_COUNT; c++)
 		glibtop_get_proc_signal (&data.proc_signal, pid);
-
+	
 	getrusage (RUSAGE_SELF, &rusage_end);

 	libgtop_timersub (&rusage_end.ru_utime, &rusage_start.ru_utime,
@@ -334,7 +333,7 @@ main (int argc, char *argv [])
 		(unsigned long) data.proc_kernel.flags, PROFILE_COUNT,
 		(long double) ELAPSED_UTIME / PROFILE_COUNT,
 		(long double) ELAPSED_STIME / PROFILE_COUNT);
-
+	
 	getrusage (RUSAGE_SELF, &total_end);

 	libgtop_timersub (&total_end.ru_utime, &total_start.ru_utime,
--- a/glibtop.h
+++ b/glibtop.h
@@ -84,4 +84,24 @@ glibtop_init_s (glibtop **server_ptr,
 		unsigned long features,
 		unsigned flags);

+#ifdef GLIBTOP_GUILE
+
+/* You need to link with -lgtop_guile to get this stuff here. */
+
+void glibtop_boot_guile (void);
+
+#endif
+
+#ifdef GLIBTOP_GUILE_NAMES
+
+/* You need to link with -lgtop_guile_names to get this stuff here. */
+
+void glibtop_boot_guile_names (void);
+
+#ifndef GLIBTOP_NAMES
+#define GLIBTOP_NAMES
+#endif
+
+#endif
+
 #endif
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,4 +1,2 @@
 SUBDIRS		= glibtop

-EXTRA_DIST	= libgtop-i18n.h
-
--- a/include/glibtop/Makefile.am
+++ b/include/glibtop/Makefile.am
@@ -4,7 +4,7 @@ glibtop_HEADERS		= close.h loadavg.h prockernel.h procstate.h \
 			  sem_limits.h uptime.h command.h mem.h proclist.h \
 			  proctime.h shm_limits.h version.h cpu.h msg_limits.h \
 			  procmem.h procuid.h swap.h write.h error.h open.h \
-			  procsegment.h read.h sysdeps.h global.h \
+			  procsegment.h read.h sysdeps.h xmalloc.h global.h \
 			  procsignal.h read_data.h union.h types.h gnuserv.h \
 			  parameter.h mountlist.h fsusage.h procmap.h signal.h \
 			  inodedb.h sysinfo.h ppp.h procargs.h netload.h
--- a/include/glibtop/array.h
+++ b/include/glibtop/array.h
@@ -41,7 +41,7 @@ typedef struct _glibtop_array	glibtop_array;

 struct _glibtop_array
 {
-    guint64 flags,
+    u_int64_t flags,
 	number,		/* GLIBTOP_ARRAY_NUMBER	*/
 	size,		/* GLIBTOP_ARRAY_SIZE	*/
 	total;		/* GLIBTOP_ARRAY_TOTAL	*/
--- a/include/glibtop/close.h
+++ b/include/glibtop/close.h
@@ -26,13 +26,13 @@

 #include <glibtop.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 void glibtop_close_r (glibtop *server);

 void glibtop_close_s (glibtop *server);
 void glibtop_close_p (glibtop *server);

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/command.h
+++ b/include/glibtop/command.h
@@ -28,7 +28,7 @@
 #include <glibtop/sysdeps.h>
 #include <glibtop/union.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_CMND_QUIT		0
 #define GLIBTOP_CMND_SYSDEPS		1
@@ -69,8 +69,8 @@ typedef union  _glibtop_response_union	glibtop_response_union;

 struct _glibtop_command
 {
-	guint64	command;
-	guint64	size, data_size;
+	u_int64_t	command;
+	u_int64_t	size, data_size;
 	char		parameter [_GLIBTOP_PARAM_SIZE];
 };

@@ -83,7 +83,7 @@ union _glibtop_response_union
 struct _glibtop_response
 {
 	int64_t offset;
-	guint64 size, data_size;
+	u_int64_t size, data_size;
 	glibtop_response_union u;
 };

@@ -97,6 +97,6 @@ void *
 glibtop_call_s (glibtop *server, unsigned command, size_t send_size,
 		const void *send_buf, size_t recv_size, void *recv_buf);

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/cpu.h
+++ b/include/glibtop/cpu.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_CPU_TOTAL	0
 #define GLIBTOP_CPU_USER	1
@@ -41,9 +41,8 @@ G_BEGIN_DECLS
 #define GLIBTOP_XCPU_NICE	8
 #define GLIBTOP_XCPU_SYS	9
 #define GLIBTOP_XCPU_IDLE	10
-#define GLIBTOP_XCPU_FLAGS  11

-#define GLIBTOP_MAX_CPU		12
+#define GLIBTOP_MAX_CPU		11

 /* Nobody should really be using more than 4 processors. */
 #define GLIBTOP_NCPU		4
@@ -52,7 +51,7 @@ typedef struct _glibtop_cpu	glibtop_cpu;

 struct _glibtop_cpu
 {
-	guint64	flags,
+	u_int64_t	flags,
 		total,				/* GLIBTOP_CPU_TOTAL		*/
 		user,				/* GLIBTOP_CPU_USER		*/
 		nice,				/* GLIBTOP_CPU_NICE		*/
@@ -63,8 +62,7 @@ struct _glibtop_cpu
 		xcpu_user [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_USER		*/
 		xcpu_nice [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_NICE		*/
 		xcpu_sys  [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_SYS		*/
-		xcpu_idle [GLIBTOP_NCPU],	/* GLIBTOP_XCPU_IDLE		*/
-		xcpu_flags;	                /* GLIBTOP_XCPU_IDLE		*/
+		xcpu_idle [GLIBTOP_NCPU];	/* GLIBTOP_XCPU_IDLE		*/
 };

 #define glibtop_get_cpu(cpu)	glibtop_get_cpu_l(glibtop_global_server, cpu)
@@ -96,6 +94,6 @@ extern const char *glibtop_descriptions_cpu [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/error.h
+++ b/include/glibtop/error.h
@@ -26,7 +26,7 @@

 #include <glibtop.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #ifndef G_GNUC_UNUSED
 #if	__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
@@ -131,6 +131,6 @@ glibtop_warn_io (char *format, ...)

 #endif /* no __GNUC__ */

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/fsusage.h
+++ b/include/glibtop/fsusage.h
@@ -1,6 +1,7 @@
 /* $Id$ */

 /* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.

   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.

@@ -26,29 +27,26 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_FSUSAGE_BLOCKS		0
 #define GLIBTOP_FSUSAGE_BFREE		1
 #define GLIBTOP_FSUSAGE_BAVAIL		2
 #define GLIBTOP_FSUSAGE_FILES		3
 #define GLIBTOP_FSUSAGE_FFREE		4
-#define GLIBTOP_FSUSAGE_BLOCK_SIZE	5
-
-#define GLIBTOP_MAX_FSUSAGE		6

+#define GLIBTOP_MAX_FSUSAGE		5

 typedef struct _glibtop_fsusage		glibtop_fsusage;

 struct _glibtop_fsusage
 {
-	guint64	flags,
-		blocks,		/* Total number of blocks. */
+	u_int64_t	flags,
+		blocks,		/* Total blocks. */
 		bfree,		/* Free blocks available to superuser. */
 		bavail,		/* Free blocks available to non-superuser. */
 		files,		/* Total file nodes. */
 		ffree;		/* Free file nodes. */
-	guint32	block_size;	/* Size of a block in bytes. */
 };

 #define glibtop_get_fsusage(fsusage,disk)	glibtop_get_fsusage_l(glibtop_global_server, fsusage, disk)
@@ -69,6 +67,6 @@ extern const char *glibtop_descriptions_fsusage [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/glibtop-backend-info.h
+++ b/include/glibtop/glibtop-backend-info.h
@@ -40,7 +40,7 @@ typedef struct _glibtop_backend_module	glibtop_backend_module;
 typedef struct _glibtop_call_vector	glibtop_call_vector;

 typedef int (*glibtop_backend_open_func_t)  (glibtop_server *, glibtop_backend *,
-					     guint64, const char **);
+					     u_int64_t, const char **);
 typedef int (*glibtop_backend_close_func_t) (glibtop_server *, glibtop_backend *,
 					     glibtop_closure *);

--- a/include/glibtop/glibtop-backend.h
+++ b/include/glibtop/glibtop-backend.h
@@ -65,7 +65,7 @@ GType
 glibtop_backend_get_type (void);

 glibtop_backend *
-glibtop_backend_get (const char *backend_name, guint64 features,
+glibtop_backend_get (const char *backend_name, u_int64_t features,
 		     const char **backend_args, GError **error);

 void
--- a/include/glibtop/glibtop-client.h
+++ b/include/glibtop/glibtop-client.h
@@ -82,7 +82,7 @@ glibtop_client_propagate_warning (glibtop_client *client, GError *error);

 void
 glibtop_client_open_backend (glibtop_client *client, const char *backend_name,
-			     guint64 features, const char **backend_args);
+			     u_int64_t features, const char **backend_args);

 void
 glibtop_client_add_backend (glibtop_client *client,
--- a/include/glibtop/global.h
+++ b/include/glibtop/global.h
@@ -24,14 +24,43 @@
 #ifndef __GLIBTOP_GLOBAL_H__
 #define __GLIBTOP_GLOBAL_H__

-#include <glib.h>
-
 #ifdef _IN_LIBGTOP
 #include <config.h>
 #endif

+/*
+ * All declarations are enclosed in BEGIN_LIBGTOP_DECLS and
+ * END_LIBGTOP_DECLS so that C++ compilers don't mangle their names.
+ *
+ */
+   
+#undef BEGIN_LIBGTOP_DECLS
+#undef END_LIBGTOP_DECLS
+#ifdef __cplusplus
+# define BEGIN_LIBGTOP_DECLS extern "C" {
+# define END_LIBGTOP_DECLS }
+#else
+# define BEGIN_LIBGTOP_DECLS /* empty */
+# define END_LIBGTOP_DECLS /* empty */
+#endif
+
 #ifdef _IN_LIBGTOP

+/* Provide macros to feature the GCC function attribute.
+ */
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
+#define G_GNUC_NORETURN				\
+  __attribute__((noreturn))
+#define G_GNUC_CONST				\
+  __attribute__((const))
+#define G_GNUC_UNUSED				\
+  __attribute__((unused))
+#else	/* !__GNUC__ */
+#define G_GNUC_NORETURN
+#define G_GNUC_CONST
+#define	G_GNUC_UNUSED
+#endif	/* !__GNUC__ */
+
 #endif /* _IN_LIBGTOP */

 #if TIME_WITH_SYS_TIME
@@ -45,6 +74,27 @@
 # endif
 #endif

+#ifdef NEED_GNOMESUPPORT_H
+#include <gnomesupport.h>
+#endif
+
+#ifdef WITHOUT_GUILE
+#undef GLIBTOP_GUILE
+#undef GLIBTOP_GUILE_NAMES
+#endif
+
+#ifdef GLIBTOP_GUILE
+#include <guile/gh.h>
+#endif
+
+#ifdef _IN_LIBGTOP
+#if (defined HAVE_LIBINTL_H) || (defined HAVE_GETTEXT)
+#include <libintl.h>
+#else
+#include <libgettext.h>
+#endif
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>

@@ -74,13 +124,18 @@

 #ifdef _IN_LIBGTOP

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS
+
+#ifndef _
+#define _(String) dgettext (PACKAGE, String)
+#define N_(String) (String)
+#endif

 #ifndef HAVE_STRERROR
 char *strerror (int errno);
 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif /* _IN_LIBGTOP */

--- a/include/glibtop/gnuserv.h
+++ b/include/glibtop/gnuserv.h
@@ -9,15 +9,15 @@

 Copyright (C) 1989 Free Software Foundation, Inc.

- Author: Andy Norman (ange@hplb.hpl.hp.com), based on
+ Author: Andy Norman (ange@hplb.hpl.hp.com), based on 
         'etc/server.c' and 'etc/emacsclient.c' from the 18.52 GNU
         Emacs distribution.

 Please mail bugs and suggestions to the author at the above address.
 */

-/* HISTORY
- * 11-Nov-1990		bristor@simba
+/* HISTORY 
+ * 11-Nov-1990		bristor@simba	
 *    Added EOT stuff.
 */

@@ -76,7 +76,7 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
 */

 #if 0
-#define MCOOKIE_SCREEN "42980"   /* screen # to use as the gnuserv cookie */
+#define MCOOKIE_SCREEN "42980"   /* screen # to use as the gnuserv cookie */ 
 #endif
 #define MCOOKIE_NAME   "MAGIC-1" /* authentication protocol name */
 #define MCOOKIE_X_NAME "MIT-MAGIC-COOKIE-1"  /* as needed by X */
@@ -106,7 +106,7 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
 * since it limits the size of requests and responses. Don't make it bigger
 * than your system's max message size though (usually a couple of k) or else
 * msgsend will start failing. For sockets, using the system BUFSIZ is usually
- * what you want.
+ * what you want. 
 */

 #if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS)
--- a/include/glibtop/inodedb.h
+++ b/include/glibtop/inodedb.h
@@ -31,7 +31,7 @@

 #define GLIBTOP_INODEDB_ALL		7

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 typedef struct _glibtop_inodedb		glibtop_inodedb;

@@ -39,7 +39,7 @@ typedef struct _glibtop_inodedb_key	glibtop_inodedb_key;

 struct _glibtop_inodedb_key
 {
-	guint64 device, inode;
+	u_int64_t device, inode;
 };

 struct _glibtop_inodedb
@@ -57,11 +57,11 @@ glibtop_inodedb_open_s (glibtop *server, unsigned databases, unsigned long cache
 const char *
 glibtop_inodedb_lookup_s (glibtop *server,
 			  glibtop_inodedb *inodedb,
-			  guint64 device, guint64 inode);
+			  u_int64_t device, u_int64_t inode);

 void
 glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb);

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/interfaces.h
+++ b/include/glibtop/interfaces.h
@@ -151,17 +151,17 @@ enum _glibtop_interface_flags {

 struct _glibtop_ifaddr
 {
-    guint64	flags,
+    u_int64_t	flags,
 	transport;			/* GLIBTOP_IFADDR_TRANSPORT	*/
    u_int8_t	addr_len,		/* GLIBTOP_IFADDR_ADDR_LEN	*/
 	address [GLIBTOP_IFADDR_LEN];	/* GLIBTOP_IFADDR_ADDRESS	*/
-    guint64	subnet,			/* GLIBTOP_IFADDR_SUBNET	*/
+    u_int64_t	subnet,			/* GLIBTOP_IFADDR_SUBNET	*/
 	scope;				/* GLIBTOP_IFADDR_SCOPE	*/
 };

 struct _glibtop_interface
 {
-    guint64	flags,
+    u_int64_t	flags,
 	if_flags,		/* GLIBTOP_INTERFACE_IF_FLAGS		*/
 	transport,		/* GLIBTOP_INTERFACE_TRANSPORT		*/
 	type,			/* GLIBTOP_INTERFACE_TYPE		*/
@@ -177,14 +177,14 @@ struct _glibtop_interface
 #define glibtop_get_interface_names_r	glibtop_get_interface_names_s
 #endif

-glibtop_interface *glibtop_get_interface_names_l (glibtop_client *client, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy);
+glibtop_interface *glibtop_get_interface_names_l (glibtop_client *client, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);

 #if GLIBTOP_SUID_INTERFACE_NAMES
 int glibtop_init_interface_names_p (glibtop_server *server, glibtop_closure *closure);
-glibtop_interface *glibtop_get_interface_names_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy);
+glibtop_interface *glibtop_get_interface_names_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
 #else
 int glibtop_init_interface_names_s (glibtop_server *server, glibtop_closure *closure);
-glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, guint64 interface, guint64 number, guint64 instance, guint64 strategy);
+glibtop_interface *glibtop_get_interface_names_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, u_int64_t interface, u_int64_t number, u_int64_t instance, u_int64_t strategy);
 #endif

 #ifdef GLIBTOP_NAMES
--- a/include/glibtop/limits.h
+++ b/include/glibtop/limits.h
@@ -45,8 +45,8 @@ G_BEGIN_DECLS
 /* Length of a network interface address in bytes. */
 #define GLIBTOP_IFADDR_LEN	16

-/* This is ((guint64)-1) */
-#define GLIBTOP_UNLIMITED	(~(guint64)0)
+/* This is ((u_int64_t)-1) */
+#define GLIBTOP_UNLIMITED	(~(u_int64_t)0)

 /* Maximum length of a backend name. */
 #define GLIBTOP_BACKEND_NAME_LEN	40
--- a/include/glibtop/loadavg.h
+++ b/include/glibtop/loadavg.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_LOADAVG_LOADAVG		0
 #define GLIBTOP_LOADAVG_NR_RUNNING	1
@@ -40,9 +40,9 @@ typedef struct _glibtop_loadavg	glibtop_loadavg;

 struct _glibtop_loadavg
 {
-	guint64 flags;
+	u_int64_t flags;
 	double loadavg [3];		/* GLIBTOP_LOADAVG_LOADAVG	*/
-	guint64 nr_running,		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
+	u_int64_t nr_running,		/* GLIBTOP_LOADAVG_NR_RUNNING	*/
 		nr_tasks,		/* GLIBTOP_LOADAVG_NR_TASKS	*/
 		last_pid;		/* GLIBTOP_LOADAVG_LAST_PID	*/
 };
@@ -76,6 +76,6 @@ extern const char *glibtop_descriptions_loadavg [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/mem.h
+++ b/include/glibtop/mem.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_MEM_TOTAL	0
 #define GLIBTOP_MEM_USED	1
@@ -44,7 +44,7 @@ typedef struct _glibtop_mem	glibtop_mem;

 struct _glibtop_mem
 {
-	guint64	flags,
+	u_int64_t	flags,
 		total,		/* GLIBTOP_MEM_TOTAL	*/
 		used,		/* GLIBTOP_MEM_USED	*/
 		free,		/* GLIBTOP_MEM_FREE	*/
@@ -84,6 +84,6 @@ extern const char *glibtop_descriptions_mem [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/mountlist.h
+++ b/include/glibtop/mountlist.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_MOUNTLIST_NUMBER	0
 #define GLIBTOP_MOUNTLIST_TOTAL		1
@@ -41,7 +41,7 @@ typedef struct _glibtop_mountlist	glibtop_mountlist;

 struct _glibtop_mountentry
 {
-	guint64 dev;
+	u_int64_t dev;
 	char devname [GLIBTOP_MOUNTENTRY_LEN+1];
 	char mountdir [GLIBTOP_MOUNTENTRY_LEN+1];
 	char type [GLIBTOP_MOUNTENTRY_LEN+1];
@@ -49,7 +49,7 @@ struct _glibtop_mountentry

 struct _glibtop_mountlist
 {
-	guint64	flags,
+	u_int64_t	flags,
 		number,			/* GLIBTOP_MOUNTLIST_NUMBER	*/
 		total,			/* GLIBTOP_MOUNTLIST_TOTAL	*/
 		size;			/* GLIBTOP_MOUNTLIST_SIZE	*/
@@ -76,6 +76,6 @@ extern const char *glibtop_descriptions_mountlist [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/msg_limits.h
+++ b/include/glibtop/msg_limits.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_IPC_MSGPOOL	0
 #define GLIBTOP_IPC_MSGMAP	1
@@ -43,7 +43,7 @@ typedef struct _glibtop_msg_limits	glibtop_msg_limits;

 struct _glibtop_msg_limits
 {
-	guint64	flags,
+	u_int64_t	flags,
 		msgpool,	/* GLIBTOP_IPC_MSGPOOL	*/
 		msgmap,		/* GLIBTOP_IPC_MSGMAP	*/
 		msgmax,		/* GLIBTOP_IPC_MSGMAX	*/
@@ -82,7 +82,7 @@ extern const char *glibtop_descriptions_msg_limits [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif

--- a/include/glibtop/netinfo.h
+++ b/include/glibtop/netinfo.h
@@ -45,7 +45,7 @@ typedef struct _glibtop_netinfo	glibtop_netinfo;

 struct _glibtop_netinfo
 {
-    guint64	flags,
+    u_int64_t	flags,
 	if_flags,			/* GLIBTOP_NETINFO_IF_FLAGS	*/
 	transport,			/* GLIBTOP_NETINFO_TRANSPORT	*/
 	mtu;				/* GLIBTOP_NETINFO_MTU		*/
@@ -57,14 +57,14 @@ struct _glibtop_netinfo
 #define glibtop_get_netinfo_r		glibtop_get_netinfo_s
 #endif

-glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport);
+glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);

 #if GLIBTOP_SUID_NETINFO
 int glibtop_init_netinfo_p (glibtop_server *server, glibtop_closure *closure);
-glibtop_ifaddr *glibtop_get_netinfo_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport);
+glibtop_ifaddr *glibtop_get_netinfo_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
 #else
 int glibtop_init_netinfo_s (glibtop_server *server, glibtop_closure *closure);
-glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport);
+glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, u_int64_t transport);
 #endif

 #ifdef GLIBTOP_NAMES
--- a/include/glibtop/netload.h
+++ b/include/glibtop/netload.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_NETLOAD_IF_FLAGS	0
 #define GLIBTOP_NETLOAD_MTU		1
@@ -69,7 +69,7 @@ enum {

 struct _glibtop_netload
 {
-	guint64	flags,
+	u_int64_t	flags,
 		if_flags,		/* GLIBTOP_NETLOAD_IF_FLAGS	*/
 		mtu,			/* GLIBTOP_NETLOAD_MTU		*/
 		subnet,			/* GLIBTOP_NETLOAD_SUBNET	*/
@@ -115,6 +115,6 @@ extern const char *glibtop_descriptions_netload [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/open.h
+++ b/include/glibtop/open.h
@@ -26,7 +26,7 @@
 #include <glibtop/read.h>
 #include <glibtop/error.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define _GLIBTOP_INIT_STATE_INIT	0x10000
 #define _GLIBTOP_INIT_STATE_OPEN	0x20000
@@ -68,6 +68,6 @@ glibtop_open_s (glibtop *server, const char *program_name,
 		const unsigned long features, const unsigned flags);


-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/parameter.h
+++ b/include/glibtop/parameter.h
@@ -25,7 +25,7 @@
 #include <glibtop.h>
 #include <glibtop/open.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_PARAM_METHOD		1
 #define GLIBTOP_PARAM_FEATURES		2
@@ -46,6 +46,6 @@ void
 glibtop_set_parameter_l (glibtop *server, const unsigned parameter,
 			 const void *data_ptr, size_t data_size);

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/ppp.h
+++ b/include/glibtop/ppp.h
@@ -27,10 +27,10 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_PPP_STATE	0
-#define GLIBTOP_PPP_BYTES_IN	1
+#define GLIBTOP_PPP_BYTES_IN	1	
 #define GLIBTOP_PPP_BYTES_OUT	2

 #define GLIBTOP_MAX_PPP		3
@@ -45,7 +45,7 @@ enum {

 struct _glibtop_ppp
 {
-	guint64	flags,
+	u_int64_t	flags,
 		state,			/* GLIBTOP_PPP_STATE		*/
 		bytes_in,		/* GLIBTOP_PPP_BYTES_IN		*/
 		bytes_out;		/* GLIBTOP_PPP_BYTES_OUT	*/
@@ -80,6 +80,6 @@ extern const char *glibtop_descriptions_ppp [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/procargs.h
+++ b/include/glibtop/procargs.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_PROC_ARGS_SIZE		0

@@ -37,7 +37,7 @@ typedef struct _glibtop_proc_args	glibtop_proc_args;

 struct _glibtop_proc_args
 {
-	guint64	flags,
+	u_int64_t	flags,
 		size;			/* GLIBTOP_PROC_ARGS_SIZE	*/
 };

@@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_proc_args [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/proccwd.h
+++ b/include/glibtop/proccwd.h
@@ -45,7 +45,7 @@ typedef struct _glibtop_proc_cwd	glibtop_proc_cwd;

 struct _glibtop_proc_cwd
 {
-    guint64	flags,
+    u_int64_t	flags,
 	size,
 	device,
 	inode;
--- a/include/glibtop/prockernel.h
+++ b/include/glibtop/prockernel.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_PROC_KERNEL_K_FLAGS	0
 #define GLIBTOP_PROC_KERNEL_MIN_FLT	1
@@ -47,8 +47,8 @@ typedef struct _glibtop_proc_kernel	glibtop_proc_kernel;

 struct _glibtop_proc_kernel
 {
-	guint64 flags;
-	guint64 k_flags,	/* kernel flags for the process */
+	u_int64_t flags;
+	u_int64_t k_flags,	/* kernel flags for the process */
 		min_flt,	/* number of minor page faults since
 				 * process start */
 		maj_flt,	/* number of major page faults since
@@ -93,6 +93,6 @@ extern const char *glibtop_descriptions_proc_kernel [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/proclist.h
+++ b/include/glibtop/proclist.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_PROCLIST_NUMBER	0
 #define GLIBTOP_PROCLIST_TOTAL	1
@@ -56,7 +56,7 @@ typedef struct _glibtop_proclist	glibtop_proclist;

 struct _glibtop_proclist
 {
-	guint64	flags,
+	u_int64_t	flags,
 		number,			/* GLIBTOP_PROCLIST_NUMBER	*/
 		total,			/* GLIBTOP_PROCLIST_TOTAL	*/
 		size;			/* GLIBTOP_PROCLIST_SIZE	*/
@@ -99,6 +99,6 @@ extern const char *glibtop_descriptions_proclist [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/procmap.h
+++ b/include/glibtop/procmap.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_PROC_MAP_NUMBER		0
 #define GLIBTOP_PROC_MAP_TOTAL		1
@@ -35,15 +35,15 @@ G_BEGIN_DECLS

 #define GLIBTOP_MAX_PROC_MAP		3

-#define GLIBTOP_MAP_ENTRY_START		0
-#define GLIBTOP_MAP_ENTRY_END		1
-#define GLIBTOP_MAP_ENTRY_OFFSET	2
-#define GLIBTOP_MAP_ENTRY_PERM		3
-#define GLIBTOP_MAP_ENTRY_INODE		4
-#define GLIBTOP_MAP_ENTRY_DEVICE	5
-#define GLIBTOP_MAP_ENTRY_FILENAME	6
+#define GLIBTOP_MAP_ENTRY_START		1
+#define GLIBTOP_MAP_ENTRY_END		2
+#define GLIBTOP_MAP_ENTRY_OFFSET	3
+#define GLIBTOP_MAP_ENTRY_PERM		4
+#define GLIBTOP_MAP_ENTRY_INODE		5
+#define GLIBTOP_MAP_ENTRY_DEVICE	6
+#define GLIBTOP_MAP_ENTRY_FILENAME	7

-#define GLIBTOP_MAX_MAP_ENTRY		7
+#define GLIBTOP_MAX_MAP_ENTRY		8

 #define GLIBTOP_MAP_FILENAME_LEN	215

@@ -59,13 +59,13 @@ typedef struct _glibtop_proc_map	glibtop_proc_map;

 struct _glibtop_map_entry
 {
-	guint64 flags, start, end, offset, perm, inode, device;
+	u_int64_t flags, start, end, offset, perm, inode, device;
 	char filename [GLIBTOP_MAP_FILENAME_LEN+1];
 };

 struct _glibtop_proc_map
 {
-	guint64	flags,
+	u_int64_t	flags,
 		number,			/* GLIBTOP_PROC_MAP_NUMBER	*/
 		total,			/* GLIBTOP_PROC_MAP_TOTAL	*/
 		size;			/* GLIBTOP_PROC_MAP_SIZE	*/
@@ -105,6 +105,6 @@ extern const char *glibtop_descriptions_proc_map [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/procmem.h
+++ b/include/glibtop/procmem.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_PROC_MEM_SIZE		0
 #define GLIBTOP_PROC_MEM_VSIZE		1
@@ -44,7 +44,7 @@ typedef struct _glibtop_proc_mem	glibtop_proc_mem;

 struct _glibtop_proc_mem
 {
-	guint64	flags,
+	u_int64_t	flags,
 		size,		/* total # of pages of memory */
 		vsize,		/* number of pages of virtual memory ... */
 		resident,	/* number of resident set
@@ -84,6 +84,6 @@ extern const char *glibtop_descriptions_proc_mem [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/procsegment.h
+++ b/include/glibtop/procsegment.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_PROC_SEGMENT_TEXT_RSS		0
 #define GLIBTOP_PROC_SEGMENT_SHLIB_RSS		1
@@ -46,7 +46,7 @@ typedef struct _glibtop_proc_segment	glibtop_proc_segment;

 struct _glibtop_proc_segment
 {
-	guint64	flags,
+	u_int64_t	flags,
 		text_rss,	/* text resident set size */
 		shlib_rss,	/* shared-lib resident set size */
 		data_rss,	/* data resident set size */
@@ -87,6 +87,6 @@ extern const char *glibtop_descriptions_proc_segment [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/procsignal.h
+++ b/include/glibtop/procsignal.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_PROC_SIGNAL_SIGNAL	0
 #define GLIBTOP_PROC_SIGNAL_BLOCKED	1
@@ -42,7 +42,7 @@ typedef struct _glibtop_proc_signal	glibtop_proc_signal;

 struct _glibtop_proc_signal
 {
-	guint64	flags,
+	u_int64_t	flags,
 		signal [2],		/* mask of pending signals */
 		blocked [2],		/* mask of blocked signals */
 		sigignore [2],		/* mask of ignored signals */
@@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_proc_signal [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/procstate.h
+++ b/include/glibtop/procstate.h
@@ -27,26 +27,14 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_PROC_STATE_CMD		0
 #define GLIBTOP_PROC_STATE_STATE	1
 #define GLIBTOP_PROC_STATE_UID		2
 #define GLIBTOP_PROC_STATE_GID		3
-#define GLIBTOP_PROC_STATE_RUID     4
-#define GLIBTOP_PROC_STATE_RGID     5
-#define GLIBTOP_PROC_STATE_HAS_CPU  6
-#define GLIBTOP_PROC_STATE_PROCESSOR 7
-#define GLIBTOP_PROC_STATE_LAST_PROCESSOR 8

-#define GLIBTOP_MAX_PROC_STATE		9
-
-#define GLIBTOP_PROCESS_RUNNING                 1
-#define GLIBTOP_PROCESS_INTERRUPTIBLE           2
-#define GLIBTOP_PROCESS_UNINTERRUPTIBLE         4
-#define GLIBTOP_PROCESS_ZOMBIE                  8
-#define GLIBTOP_PROCESS_STOPPED                 16
-#define GLIBTOP_PROCESS_SWAPPING                32
+#define GLIBTOP_MAX_PROC_STATE		4

 typedef struct _glibtop_proc_state	glibtop_proc_state;

@@ -54,10 +42,10 @@ typedef struct _glibtop_proc_state	glibtop_proc_state;

 struct _glibtop_proc_state
 {
-	guint64 flags;
-	char cmd[40];		/* basename of executable file in
+	u_int64_t flags;
+	char cmd[40],		/* basename of executable file in 
 				 * call to exec(2) */
-	unsigned state;		/* single-char code for process state
+		state;		/* single-char code for process state
 				 * (S=sleeping) */
 	/* NOTE: when porting the library, TRY HARD to implement the
 	 *       following two fields. */
@@ -65,12 +53,7 @@ struct _glibtop_proc_state
 	 *                   only to set the flags value for those two
 	 *                   fields if their values are corrent ! */
 	int uid,		/* UID of process */
-		gid,		/* GID of process */
-        ruid,
-        rgid;
-    int has_cpu,
-        processor,
-        last_processor;
+		gid;		/* GID of process */
 };

 #define glibtop_get_proc_state(p1, p2)	glibtop_get_proc_state_l(glibtop_global_server, p1, p2)
@@ -90,7 +73,7 @@ void glibtop_get_proc_state_p (glibtop *server, glibtop_proc_state *buf, pid_t p
 void glibtop_init_proc_state_s (glibtop *server);
 void glibtop_get_proc_state_s (glibtop *server, glibtop_proc_state *buf, pid_t pid);
 #endif
-
+     
 #ifdef GLIBTOP_NAMES

 /* You need to link with -lgtop_names to get this stuff here. */
@@ -102,6 +85,6 @@ extern const char *glibtop_descriptions_proc_state [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/proctime.h
+++ b/include/glibtop/proctime.h
@@ -28,7 +28,7 @@
 #include <glibtop/cpu.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_PROC_TIME_START_TIME	0
 #define GLIBTOP_PROC_TIME_RTIME		1
@@ -50,15 +50,15 @@ typedef struct _glibtop_proc_time	glibtop_proc_time;

 struct _glibtop_proc_time
 {
-	guint64	flags,
-		start_time,	/* start time of process --
+	u_int64_t	flags,
+		start_time,	/* start time of process -- 
 				 * seconds since 1-1-70 */
 		rtime,		/* real time accumulated by process */
 		utime,		/* user-mode CPU time accumulated by process */
 		stime,		/* kernel-mode CPU time accumulated by process */
-		cutime,		/* cumulative utime of process and
+		cutime,		/* cumulative utime of process and 
 				 * reaped children */
-		cstime,		/* cumulative stime of process and
+		cstime,		/* cumulative stime of process and 
 				 * reaped children */
 		timeout,	/* The time (in jiffies) of the process's
 				 * next timeout */
@@ -99,6 +99,6 @@ extern const char *glibtop_descriptions_proc_time [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/procuid.h
+++ b/include/glibtop/procuid.h
@@ -27,46 +27,34 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_PROC_UID_UID		0
 #define GLIBTOP_PROC_UID_EUID		1
 #define GLIBTOP_PROC_UID_GID		2
 #define GLIBTOP_PROC_UID_EGID		3
-#define GLIBTOP_PROC_UID_SUID		4
-#define GLIBTOP_PROC_UID_SGID		5
-#define GLIBTOP_PROC_UID_FSUID		6
-#define GLIBTOP_PROC_UID_FSGID		7
-#define GLIBTOP_PROC_UID_PID		8
-#define GLIBTOP_PROC_UID_PPID		9
-#define GLIBTOP_PROC_UID_PGRP		10
-#define GLIBTOP_PROC_UID_SESSION	11
-#define GLIBTOP_PROC_UID_TTY		12
-#define GLIBTOP_PROC_UID_TPGID		13
-#define GLIBTOP_PROC_UID_PRIORITY	14
-#define GLIBTOP_PROC_UID_NICE		15
-#define GLIBTOP_PROC_UID_NGROUPS    16
-#define GLIBTOP_PROC_UID_GROUPS     17
+#define GLIBTOP_PROC_UID_PID		4
+#define GLIBTOP_PROC_UID_PPID		5
+#define GLIBTOP_PROC_UID_PGRP		6
+#define GLIBTOP_PROC_UID_SESSION	7
+#define GLIBTOP_PROC_UID_TTY		8
+#define GLIBTOP_PROC_UID_TPGID		9
+#define GLIBTOP_PROC_UID_PRIORITY	10
+#define GLIBTOP_PROC_UID_NICE		11

-#define GLIBTOP_MAX_PROC_UID		18
+#define GLIBTOP_MAX_PROC_UID		12

 typedef struct _glibtop_proc_uid	glibtop_proc_uid;

-#define GLIBTOP_MAX_GROUPS          64
-
 /* User, Group, Terminal and session */

 struct _glibtop_proc_uid
 {
-	guint64 flags;
+	u_int64_t flags;
 	int uid,		/* user id */
 		euid,		/* effective user id */
 		gid,		/* group id */
 		egid,		/* effective group id */
-        suid,       /* set user id */
-        sgid,       /* set group id */
-        fsuid,      /* ??? user id */
-        fsgid,      /* ??? group id */
 		pid,		/* process id */
 		ppid,		/* pid of parent process */
 		pgrp,		/* process group id */
@@ -74,10 +62,7 @@ struct _glibtop_proc_uid
 		tty,		/* full device number of controlling terminal */
 		tpgid,		/* terminal process group id */
 		priority,	/* kernel scheduling priority */
-		nice,		/* standard unix nice level of process */
-		ngroups,
-        groups [GLIBTOP_MAX_GROUPS];
-
+		nice;		/* standard unix nice level of process */
 };

 #define glibtop_get_proc_uid(p1, p2)	glibtop_get_proc_uid_l(glibtop_global_server, p1, p2)
@@ -109,6 +94,6 @@ extern const char *glibtop_descriptions_proc_uid [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/read.h
+++ b/include/glibtop/read.h
@@ -27,13 +27,13 @@
 #include <glibtop.h>
 #include <glibtop/error.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define glibtop_read(p1, p2)	glibtop_read(glibtop_global_server, p1, p2)

 void glibtop_read_l (glibtop *server, size_t size, void *buf);
 void glibtop_read_s (glibtop *server, size_t size, void *buf);

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/read_data.h
+++ b/include/glibtop/read_data.h
@@ -27,13 +27,13 @@
 #include <glibtop.h>
 #include <glibtop/error.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define glibtop_read_data()	glibtop_read_data_r(glibtop_global_server)

 void *glibtop_read_data_l (glibtop *server);
 void *glibtop_read_data_s (glibtop *server);

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/sem_limits.h
+++ b/include/glibtop/sem_limits.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_IPC_SEMMAP	0
 #define GLIBTOP_IPC_SEMMNI	1
@@ -46,7 +46,7 @@ typedef struct _glibtop_sem_limits	glibtop_sem_limits;

 struct _glibtop_sem_limits
 {
-	guint64	flags,
+	u_int64_t	flags,
 		semmap,		/* GLIBTOP_IPC_SEMMAP	*/
 		semmni,		/* GLIBTOP_IPC_SEMMNI	*/
 		semmns,		/* GLIBTOP_IPC_SEMMNS	*/
@@ -88,6 +88,6 @@ extern const char *glibtop_descriptions_sem_limits [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/shm_limits.h
+++ b/include/glibtop/shm_limits.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_IPC_SHMMAX	0
 #define GLIBTOP_IPC_SHMMIN	1
@@ -41,7 +41,7 @@ typedef struct _glibtop_shm_limits	glibtop_shm_limits;

 struct _glibtop_shm_limits
 {
-	guint64	flags,
+	u_int64_t	flags,
 		shmmax,		/* GLIBTOP_IPC_SHMMAX	*/
 		shmmin,		/* GLIBTOP_IPC_SHMMIN	*/
 		shmmni,		/* GLIBTOP_IPC_SHMMNI	*/
@@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_shm_limits [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/signal.h
+++ b/include/glibtop/signal.h
@@ -30,7 +30,7 @@
 #include <sys/signal.h>
 #endif

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 typedef struct _glibtop_signame	glibtop_signame;

@@ -42,6 +42,6 @@ struct _glibtop_signame

 extern const glibtop_signame glibtop_sys_siglist [];

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/swap.h
+++ b/include/glibtop/swap.h
@@ -27,7 +27,7 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_SWAP_TOTAL	0
 #define GLIBTOP_SWAP_USED	1
@@ -41,7 +41,7 @@ typedef struct _glibtop_swap	glibtop_swap;

 struct _glibtop_swap
 {
-	guint64	flags,
+	u_int64_t	flags,
 		total,		/* GLIBTOP_SWAP_TOTAL	*/
 		used,		/* GLIBTOP_SWAP_USED	*/
 		free,		/* GLIBTOP_SWAP_FREE	*/
@@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_swap [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/sysdeps.h
+++ b/include/glibtop/sysdeps.h
@@ -26,7 +26,7 @@

 #include <glibtop.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_SYSDEPS_FEATURES	0
 #define GLIBTOP_SYSDEPS_CPU		1
@@ -64,7 +64,7 @@ typedef struct _glibtop_sysdeps	glibtop_sysdeps;

 struct _glibtop_sysdeps
 {
-	guint64 flags,
+	u_int64_t flags,
 		features,		/* server features	*/
 		cpu,			/* glibtop_cpu		*/
 		mem,			/* glibtop_mem		*/
@@ -105,6 +105,6 @@ extern const char *glibtop_descriptions_sysdeps [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/sysinfo.h
+++ b/include/glibtop/sysinfo.h
@@ -30,12 +30,11 @@

 #include <glib.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

-#define GLIBTOP_SYSINFO_NCPU		0
-#define GLIBTOP_SYSINFO_CPUINFO		1
+#define GLIBTOP_SYSINFO_CPUINFO		0

-#define GLIBTOP_MAX_SYSINFO		2
+#define GLIBTOP_MAX_SYSINFO		1

 typedef struct _glibtop_sysinfo	glibtop_sysinfo;

@@ -44,22 +43,22 @@ typedef struct _glibtop_entry	glibtop_entry;
 struct _glibtop_entry
 {
 	GPtrArray	*labels;
-	GHashTable	*values; /* key -> description */
-	GHashTable	*descriptions; /* unused */
+	GHashTable	*values;
+	GHashTable	*descriptions;
 };

 struct _glibtop_sysinfo
 {
-	guint64	flags, ncpu;
-	glibtop_entry cpuinfo [GLIBTOP_NCPU];
+	u_int64_t	flags, ncpu;
+	glibtop_entry	cpuinfo [GLIBTOP_NCPU];
 };

 #define glibtop_get_sysinfo()	glibtop_get_sysinfo_s(glibtop_global_server)

 #define glibtop_get_sysinfo_r	glibtop_get_sysinfo_s

-const glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
+glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/types.h
+++ b/include/glibtop/types.h
@@ -24,7 +24,7 @@
 #ifndef __GLIBTOP_TYPES_H__
 #define __GLIBTOP_TYPES_H__

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_TYPE_LONG	1
 #define GLIBTOP_TYPE_ULONG	2
@@ -33,6 +33,6 @@ G_BEGIN_DECLS
 #define GLIBTOP_TYPE_CHAR	5
 #define GLIBTOP_TYPE_STRING	6

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/union.h
+++ b/include/glibtop/union.h
@@ -50,7 +50,7 @@
 #include <glibtop/netload.h>
 #include <glibtop/ppp.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 typedef union _glibtop_union	glibtop_union;

@@ -80,6 +80,6 @@ union _glibtop_union
 	glibtop_ppp		ppp;
 };

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/uptime.h
+++ b/include/glibtop/uptime.h
@@ -27,22 +27,20 @@
 #include <glibtop.h>
 #include <glibtop/global.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define GLIBTOP_UPTIME_UPTIME		0
 #define GLIBTOP_UPTIME_IDLETIME		1
-#define GLIBTOP_UPTIME_BOOT_TIME    2

-#define GLIBTOP_MAX_UPTIME		3
+#define GLIBTOP_MAX_UPTIME		2

 typedef struct _glibtop_uptime	glibtop_uptime;

 struct _glibtop_uptime
 {
-	guint64 flags;
+	u_int64_t flags;
 	double uptime,		/* GLIBTOP_UPTIME_UPTIME	*/
 		idletime;	/* GLIBTOP_UPTIME_IDLETIME	*/
-	guint64 boot_time;
 };

 #define glibtop_get_uptime(uptime)	glibtop_get_uptime_l(glibtop_global_server, uptime)
@@ -74,6 +72,6 @@ extern const char *glibtop_descriptions_uptime [];

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/version.h
+++ b/include/glibtop/version.h
@@ -29,7 +29,7 @@

 #define LIBGTOP_VERSION_STRING "Libgtop %s server version %s (%u,%u,%u,%u)."

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #if _IN_LIBGTOP

@@ -37,6 +37,6 @@ void glibtop_send_version (glibtop *server, int fd);

 #endif

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/write.h
+++ b/include/glibtop/write.h
@@ -27,13 +27,13 @@
 #include <glibtop.h>
 #include <glibtop/error.h>

-G_BEGIN_DECLS
+BEGIN_LIBGTOP_DECLS

 #define glibtop_write(p1, p2)	glibtop_write(glibtop_global_server, p1, p2)

 void glibtop_write_l (glibtop *server, size_t size, void *buf);
 void glibtop_write_s (glibtop *server, size_t size, void *buf);

-G_END_DECLS
+END_LIBGTOP_DECLS

 #endif
--- a/include/glibtop/xmalloc.h
+++ b/include/glibtop/xmalloc.h
@@ -0,0 +1,46 @@
+/* $Id$ */
+
+/* Copyright (C) 1998-99 Martin Baulig
+   This file is part of LibGTop 1.0.
+
+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
+
+   LibGTop is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License,
+   or (at your option) any later version.
+
+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+   for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with LibGTop; see the file COPYING. If not, write to the
+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.
+*/
+
+#ifndef __GLIBTOP_XMALLOC_H__
+#define __GLIBTOP_XMALLOC_H__
+
+#include <glibtop.h>
+#include <glibtop/error.h>
+
+BEGIN_LIBGTOP_DECLS
+
+#define glibtop_malloc(p1)	glibtop_malloc_r(glibtop_global_server, p1)
+#define glibtop_calloc(p1, p2)	glibtop_calloc_r(glibtop_global_server, p1, p2)
+#define glibtop_realloc(p1, p2)	glibtop_realloc_r(glibtop_global_server, p1, p2)
+#define glibtop_strdup(p1)	glibtop_strdup_r(glibtop_global_server, p1)
+#define glibtop_free(p1)	glibtop_free_r(glibtop_global_server, p1)
+
+void *glibtop_malloc_r	(glibtop *server, size_t size);
+void *glibtop_calloc_r	(glibtop *server, size_t nmemb, size_t size);
+void *glibtop_realloc_r	(glibtop *server, void *ptr, size_t size);
+char *glibtop_strdup_r	(glibtop *server, const char *string);
+void glibtop_free_r	(glibtop *server, const void *ptr);
+
+END_LIBGTOP_DECLS
+
+#endif
--- a/include/libgtop-i18n.h
+++ b/include/libgtop-i18n.h
@@ -1,11 +0,0 @@
-
-#include <config.h>
-
-#include <libintl.h>
-#define _(String) gettext (String)
-#ifdef gettext_noop
-#   define N_(String) gettext_noop (String)
-#else
-#   define N_(String) (String)
-#endif
-
--- a/kernel/sysctl/libgtop.c
+++ b/kernel/sysctl/libgtop.c
@@ -212,7 +212,7 @@ get_wchan (struct task_struct *p)
 	    return ((unsigned long *)schedule_frame)[12];
 	}
 	return pc;
-    }
+    }	
 #elif defined(__mc68000__)
    {
 	unsigned long fp, pc;
@@ -318,7 +318,7 @@ static inline void
 task_mem (struct task_struct *p, libgtop_proc_segment_t *proc_segment)
 {
    struct mm_struct * mm = p->mm;
-
+    
    if (mm && mm != &init_mm) {
 	struct vm_area_struct * vma = mm->mmap;
 	unsigned long data = 0, stack = 0;
@@ -486,7 +486,7 @@ get_statm (struct task_struct *tsk, libgtop_proc_mem_t *proc_mem)
 	}
    }

-    proc_mem->segment.vsize = vsize;
+    proc_mem->segment.vsize = vsize;    
    proc_mem->segment.data = data;
    proc_mem->segment.stack = stack;
    proc_mem->segment.exec = exec;
@@ -498,7 +498,7 @@ get_statm (struct task_struct *tsk, libgtop_proc_mem_t *proc_mem)
    proc_mem->trs = trs;
    proc_mem->lrs = lrs;
    proc_mem->drs = drs;
-    proc_mem->dt = dt;
+    proc_mem->dt = dt; 
 }

 static void
@@ -522,7 +522,7 @@ collect_sigign_sigcatch (struct task_struct *p, sigset_t *ign,
    }
 }

-static void
+static void 
 task_sig (struct task_struct *p, libgtop_proc_signal_t *proc_signal)
 {
    sigset_t ignore, catch;
@@ -670,7 +670,7 @@ libgtop_sysctl (ctl_table *table, int nlen, int *name)

 	    if ((which & LIBGTOP_EXCLUDE_NOTTY) && (tsk->tty == NULL))
 		continue;
-
+			
 	    proclist->pids [tindex++] = tsk->pid;
 	}

@@ -702,7 +702,7 @@ libgtop_sysctl_proc (ctl_table *table, int nlen, int *name,
    case LIBGTOP_PROC_STATE:
 	proc_state = table->data;
 	memset (proc_state, 0, sizeof (libgtop_proc_state_t));
-
+	
 	proc_state->uid = tsk->uid;
 	proc_state->gid = tsk->gid;
 	proc_state->flags = tsk->flags;
@@ -711,12 +711,12 @@ libgtop_sysctl_proc (ctl_table *table, int nlen, int *name,
 	proc_state->euid = tsk->euid;
 	proc_state->suid = tsk->suid;
 	proc_state->fsuid = tsk->fsuid;
-
+		
 	proc_state->gid = tsk->gid;
 	proc_state->egid = tsk->egid;
 	proc_state->sgid = tsk->sgid;
 	proc_state->fsgid = tsk->fsgid;
-
+		
 	proc_state->pid = tsk->pid;
 	proc_state->pgrp = tsk->pgrp;
 	proc_state->ppid = tsk->p_pptr->pid;
@@ -757,12 +757,12 @@ libgtop_sysctl_proc (ctl_table *table, int nlen, int *name,
 	proc_state->it_real_incr = tsk->it_real_incr;
 	proc_state->it_prof_incr = tsk->it_prof_incr;
 	proc_state->it_virt_incr = tsk->it_virt_incr;
-
+	
 	proc_state->min_flt = tsk->min_flt;
 	proc_state->cmin_flt = tsk->cmin_flt;
 	proc_state->maj_flt = tsk->maj_flt;
 	proc_state->cmaj_flt = tsk->cmaj_flt;
-
+		
 	proc_state->nswap = tsk->nswap;
 	proc_state->cnswap = tsk->cnswap;

@@ -794,7 +794,7 @@ libgtop_sysctl_proc (ctl_table *table, int nlen, int *name,
 	proc_state->ngroups = tsk->ngroups;
 	for (i = 0; i < min (tsk->ngroups, LIBGTOP_MAX_GROUPS); i++)
 	    proc_state->groups [i] = tsk->groups [i];
-
+	
 	if (tsk->state & TASK_INTERRUPTIBLE)
 	    proc_state->state |= LIBGTOP_TASK_INTERRUPTIBLE;
 	if (tsk->state & TASK_UNINTERRUPTIBLE)
@@ -1023,7 +1023,7 @@ proc_args_ctl_handler (ctl_table *table, int *name, int nlen,

    if (put_user (len, oldlenp))
 	goto err_fault_free_page;
-
+    
    if (copy_to_user (oldval, (void *) page, len))
 	goto err_fault_free_page;

@@ -1113,7 +1113,7 @@ proc_maps_ctl_handler (ctl_table *table, int *name, int nlen,
 	    proc_maps->filename [LIBGTOP_MAP_PATH_LEN-1] = '\0';
 	    proc_maps->header.filename_offset = line - proc_maps->filename;

-	    proc_maps->header.device =
+	    proc_maps->header.device = 
 		map->vm_file->f_dentry->d_inode->i_dev;
 	    proc_maps->header.inode =
 		map->vm_file->f_dentry->d_inode->i_ino;
@@ -1243,13 +1243,13 @@ proc_net_ctl_handler (ctl_table *table, int *name, int nlen,
    netload.rx_frame_errors = stats->rx_frame_errors;
    netload.rx_fifo_errors = stats->rx_fifo_errors;
    netload.rx_missed_errors = stats->rx_missed_errors;
-
+    
    netload.tx_aborted_errors = stats->tx_aborted_errors;
    netload.tx_carrier_errors = stats->tx_carrier_errors;
    netload.tx_fifo_errors = stats->tx_fifo_errors;
    netload.tx_heartbeat_errors = stats->tx_heartbeat_errors;
    netload.tx_window_errors = stats->tx_window_errors;
-
+    
    netload.rx_compressed = stats->rx_compressed;
    netload.tx_compressed = stats->tx_compressed;

--- a/kernel/sysctl/libgtop.h
+++ b/kernel/sysctl/libgtop.h
@@ -218,7 +218,7 @@ struct libgtop_netload
    unsigned long tx_dropped;		/* no space available in linux	*/
    unsigned long multicast;		/* multicast packets received	*/
    unsigned long collisions;
-
+    
    /* detailed rx_errors: */
    unsigned long rx_length_errors;
    unsigned long rx_over_errors;	/* receiver ring buff overflow	*/
@@ -226,14 +226,14 @@ struct libgtop_netload
    unsigned long rx_frame_errors;	/* recv'd frame alignment error */
    unsigned long rx_fifo_errors;	/* recv'r fifo overrun		*/
    unsigned long rx_missed_errors;	/* receiver missed packet	*/
-
+    
    /* detailed tx_errors */
    unsigned long tx_aborted_errors;
    unsigned long tx_carrier_errors;
    unsigned long tx_fifo_errors;
    unsigned long tx_heartbeat_errors;
    unsigned long tx_window_errors;
-
+    
    /* for cslip etc */
    unsigned long rx_compressed;
    unsigned long tx_compressed;
--- a/kernel/table.h
+++ b/kernel/table.h
@@ -15,7 +15,7 @@
 #define TABLE_KERN_PROC_UID		5
 #define TABLE_KERN_PROC_RUID		6

-#define TABLE_KERN_PROC_MASK		15
+#define TABLE_KERN_PROC_MASK		15	

 #define TABLE_EXCLUDE_IDLE		0x1000
 #define TABLE_EXCLUDE_SYSTEM		0x2000
@@ -178,7 +178,7 @@ union table
 	struct table_proc_mem proc_mem;
 	struct table_proc_segment proc_segment;
 	struct table_proc_time proc_time;
-	struct table_proc_state proc_state;
+	struct table_proc_state proc_state;	
 	struct table_proc_signal proc_signal;
 	struct table_proc_kernel proc_kernel;
 };
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bastien Nocera	d1a9dab750	2.0.8 (huh?) 2003-12-19 Bastien Nocera <hadess@hadess.net> * configure.in: 2.0.8 (huh?)	2003-12-19 16:08:23 +00:00
Zygimantas Berucka	956fdf57de	Added "lt" to ALL_LINGUAS. Added Lithuanian translation by Tomas Kuliavas. 2003-11-04 Zygimantas Berucka <uid0@tuxfamily.org> * configure.in: Added "lt" to ALL_LINGUAS. * po/lt.po: Added Lithuanian translation by Tomas Kuliavas.	2003-11-04 17:05:42 +00:00
Jordi Mallach	82ae93ab70	Typo fixes by Jordi Mas <jmas@softcatala.org>.	2003-11-03 14:04:36 +00:00
Vincent van Adrighem	2159e530c5	Dutch translation updated by Jeroen van der Vegt. 2003-10-29 Vincent van Adrighem <adrighem@gnome.org> * nl.po: Dutch translation updated by Jeroen van der Vegt.	2003-10-29 15:17:21 +00:00
Kjartan Maraas	bec5e10bb1	Flush this	2003-10-25 17:17:40 +00:00
Christian Neumair	7bd1293665	Updated German translation.	2003-10-25 16:40:16 +00:00
Vincent van Adrighem	5edf277435	Dutch translation updated by Vincent van Adrighem. 2003-10-22 Vincent van Adrighem <adrighem@gnome.org> * nl.po: Dutch translation updated by Vincent van Adrighem.	2003-10-21 22:27:31 +00:00
Christian Rose	3f307e8e30	Updated Swedish translation. 2003-10-22 Christian Rose <menthos@menthos.com> * sv.po: Updated Swedish translation.	2003-10-21 22:09:35 +00:00
Bastien Nocera	b375457834	reverted string freeze breakage 2003-10-21 Bastien Nocera <hadess@hadess.net> * lib/read.c: (glibtop_read_l): * lib/read_data.c: (glibtop_read_data_l): * lib/write.c: (glibtop_write_l): reverted string freeze breakage	2003-10-21 21:28:13 +00:00
Christian Neumair	79e8b914ed	Updated German translation.	2003-10-21 12:09:36 +00:00
Christian Rose	faacbd7f8b	Updated Swedish translation. 2003-10-21 Christian Rose <menthos@menthos.com> * sv.po: Updated Swedish translation.	2003-10-21 11:11:31 +00:00
Bastien Nocera	dde57bee91	apply patch for ngettext support by Christian Neumair <chris@gnome-de.org> 2003-10-20 Bastien Nocera <hadess@hadess.net> * lib/read.c: (glibtop_read_l): * lib/read_data.c: (glibtop_read_data_l): * lib/write.c: (glibtop_write_l): apply patch for ngettext support by Christian Neumair <chris@gnome-de.org>	2003-10-20 21:32:20 +00:00
Bastien Nocera	08798f05f5	link to libgtop_suid_common-2.0.la (Closes: #107990 ) 2003-10-20 Bastien Nocera <hadess@hadess.net> * src/inodedb/Makefile.am: link to libgtop_suid_common-2.0.la (Closes: #107990)	2003-10-20 20:48:37 +00:00
Bastien Nocera	486e6b0260	committing patch from Sebastien Bacher <seb128@debian.org> for Linux 2.6 2003-10-20 Bastien Nocera <hadess@hadess.net> * glibtop_server.h: * mem.c: (glibtop_get_mem_s): * swap.c: (glibtop_get_swap_s): committing patch from Sebastien Bacher <seb128@debian.org> for Linux 2.6 support (Closes: #104747)	2003-10-20 20:41:06 +00:00
Bastien Nocera	1c96e35cc0	fix swap sizes in FreeBSD, patch by edwin@mavetju.org 2003-10-20 Bastien Nocera <hadess@hadess.net> * swap.c: (glibtop_get_swap_p): fix swap sizes in FreeBSD, patch by edwin@mavetju.org	2003-10-20 19:53:57 +00:00
Bastien Nocera	83a3d5f76d	make it compile 2003-10-20 Bastien Nocera <hadess@hadess.net> * configure.in: make it compile	2003-10-20 12:14:10 +00:00