From 68cebe2aaf54124659ba406488c7f295c5d1edec Mon Sep 17 00:00:00 2001 From: Kjartan Maraas Date: Tue, 10 Jun 2003 17:09:39 +0000 Subject: [PATCH] Fix missing build flags. Patch from Julio Merino. Fixes bug #103086. Fix 2003-06-10 Kjartan Maraas * libgtop-2.0.pc.in: Fix missing build flags. Patch from Julio Merino. Fixes bug #103086. * sysdeps/linux/mem.c: (glibtop_get_mem_s): Fix memory calculation under Linux. Patch from . Fixes bug #68626. 2003-06-10 Kjartan Maraas --- ChangeLog | 7 +++++++ libgtop-2.0.pc.in | 2 +- sysdeps/linux/mem.c | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83643263..79f5ae46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-06-10 Kjartan Maraas + + * libgtop-2.0.pc.in: Fix missing build flags. Patch from + Julio Merino. Fixes bug #103086. + * sysdeps/linux/mem.c: (glibtop_get_mem_s): Fix memory calculation + under Linux. Patch from . Fixes bug #68626. + 2003-06-10 Kjartan Maraas * sysdeps/freebsd/glibtop_machine.h: diff --git a/libgtop-2.0.pc.in b/libgtop-2.0.pc.in index 11683466..2f111a42 100644 --- a/libgtop-2.0.pc.in +++ b/libgtop-2.0.pc.in @@ -7,7 +7,7 @@ Name: libgtop Description: Portable System Access Library Requires: glib-2.0 Version: @VERSION@ -Libs: -L${libdir} @LIBGTOP_LIBS@ +Libs: -L${libdir} @LIBGTOP_LIBS@ @LIBGTOP_EXTRA_LIBS@ Cflags: -I${includedir}/libgtop-2.0 diff --git a/sysdeps/linux/mem.c b/sysdeps/linux/mem.c index 732dbe51..53b0f6a8 100644 --- a/sysdeps/linux/mem.c +++ b/sysdeps/linux/mem.c @@ -75,7 +75,7 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf) buf->buffer = strtoul (p, &p, 0); buf->cached = strtoul (p, &p, 0); - buf->user = buf->total - buf->free - buf->shared - buf->buffer; + buf->user = buf->total - buf->free - buf->cached - buf->buffer; buf->flags = _glibtop_sysdeps_mem; }