- fixed compilation

2003-10-20 15:20:16 +00:00
parent ba36a20cb8
commit b67e4c7f7d
166 changed files with 434 additions and 333 deletions
--- a/77
+++ b/77
@@ -1,3 +1,80 @@
+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
--- a/backends/common/ChangeLog
+++ b/backends/common/ChangeLog
@@ -1,3 +1,7 @@
+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.h
+++ b/backends/common/backend-common.h
@@ -30,7 +30,6 @@
 #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,3 +1,10 @@
+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):
--- a/backends/server/backend-server.h
+++ b/backends/server/backend-server.h
@@ -30,7 +30,6 @@
 #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/command.h.in
+++ b/backends/server/command.h.in
@@ -31,7 +31,7 @@
 #include <glibtop.h>
 #include <glibtop/union.h>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

@@GLIBTOP_COMMAND_CONSTANTS@@

@@ -54,6 +54,6 @@ struct _glibtop_response
    u_int64_t recv_size, data_size;
 };

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif
--- a/backends/server/demarshal.pl
+++ b/backends/server/demarshal.pl
@@ -26,7 +26,6 @@ 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>';
--- a/backends/server/server.h
+++ b/backends/server/server.h
@@ -31,7 +31,6 @@

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

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

 #include "command.h"

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

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

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif
--- a/backends/sysdeps/ChangeLog
+++ b/backends/sysdeps/ChangeLog
@@ -1,3 +1,7 @@
+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.h
+++ b/backends/sysdeps/backend-sysdeps.h
@@ -30,7 +30,6 @@
 #include <glibtop/global.h>

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

--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,3 +1,15 @@
+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
--- a/examples/first.c
+++ b/examples/first.c
@@ -26,7 +26,6 @@
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
-#include <glibtop/xmalloc.h>

 #include <glibtop/parameter.h>

--- a/examples/mountlist.c
+++ b/examples/mountlist.c
@@ -26,7 +26,6 @@
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
-#include <glibtop/xmalloc.h>

 #include <glibtop/parameter.h>

--- a/examples/netload.c
+++ b/examples/netload.c
@@ -26,7 +26,6 @@
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
-#include <glibtop/xmalloc.h>

 #include <glibtop/parameter.h>

--- a/examples/procmap.c
+++ b/examples/procmap.c
@@ -26,7 +26,6 @@
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
-#include <glibtop/xmalloc.h>

 #include <glibtop/parameter.h>

--- a/examples/second.c
+++ b/examples/second.c
@@ -27,7 +27,6 @@
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
-#include <glibtop/xmalloc.h>

 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>
--- a/examples/smp.c
+++ b/examples/smp.c
@@ -26,7 +26,6 @@

 #include <glibtop.h>
 #include <glibtop/cpu.h>
-#include <glibtop/xmalloc.h>

 int
 main (int argc, char *argv [])
--- a/examples/sysdeps.c
+++ b/examples/sysdeps.c
@@ -26,7 +26,6 @@
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
-#include <glibtop/xmalloc.h>

 #include <glibtop/parameter.h>

--- a/examples/third.c
+++ b/examples/third.c
@@ -27,7 +27,6 @@
     
 #include <glibtop/open.h>
 #include <glibtop/close.h>
-#include <glibtop/xmalloc.h>

 #include <glibtop/union.h>
 #include <glibtop/sysdeps.h>
--- a/examples/timings.c
+++ b/examples/timings.c
@@ -26,7 +26,6 @@
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
-#include <glibtop/xmalloc.h>

 #include <glibtop/parameter.h>

--- a/glibtop.h
+++ b/glibtop.h
@@ -84,24 +84,4 @@ 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/glibtop/close.h
+++ b/include/glibtop/close.h
@@ -26,13 +26,13 @@

 #include <glibtop.h>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 void glibtop_close_r (glibtop *server);

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

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_CMND_QUIT		0
 #define GLIBTOP_CMND_SYSDEPS		1
@@ -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);

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_CPU_TOTAL	0
 #define GLIBTOP_CPU_USER	1
@@ -94,6 +94,6 @@ extern const char *glibtop_descriptions_cpu [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

 #include <glibtop.h>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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__ */

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_FSUSAGE_BLOCKS		0
 #define GLIBTOP_FSUSAGE_BFREE		1
@@ -67,6 +67,6 @@ extern const char *glibtop_descriptions_fsusage [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif
--- a/include/glibtop/global.h
+++ b/include/glibtop/global.h
@@ -24,43 +24,14 @@
 #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
@@ -74,27 +45,6 @@
 # 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>

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

 #ifdef _IN_LIBGTOP

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

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

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif /* _IN_LIBGTOP */

--- a/include/glibtop/inodedb.h
+++ b/include/glibtop/inodedb.h
@@ -31,7 +31,7 @@

 #define GLIBTOP_INODEDB_ALL		7

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 typedef struct _glibtop_inodedb		glibtop_inodedb;

@@ -62,6 +62,6 @@ glibtop_inodedb_lookup_s (glibtop *server,
 void
 glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb);

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_LOADAVG_LOADAVG		0
 #define GLIBTOP_LOADAVG_NR_RUNNING	1
@@ -76,6 +76,6 @@ extern const char *glibtop_descriptions_loadavg [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_MEM_TOTAL	0
 #define GLIBTOP_MEM_USED	1
@@ -84,6 +84,6 @@ extern const char *glibtop_descriptions_mem [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_MOUNTLIST_NUMBER	0
 #define GLIBTOP_MOUNTLIST_TOTAL		1
@@ -76,6 +76,6 @@ extern const char *glibtop_descriptions_mountlist [];

 #endif

-END_LIBGTOP_DECLS
+G_END_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>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_IPC_MSGPOOL	0
 #define GLIBTOP_IPC_MSGMAP	1
@@ -82,7 +82,7 @@ extern const char *glibtop_descriptions_msg_limits [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_NETLOAD_IF_FLAGS	0
 #define GLIBTOP_NETLOAD_MTU		1
@@ -115,6 +115,6 @@ extern const char *glibtop_descriptions_netload [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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);


-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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);

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_PPP_STATE	0
 #define GLIBTOP_PPP_BYTES_IN	1	
@@ -80,6 +80,6 @@ extern const char *glibtop_descriptions_ppp [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_PROC_ARGS_SIZE		0

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

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_PROC_KERNEL_K_FLAGS	0
 #define GLIBTOP_PROC_KERNEL_MIN_FLT	1
@@ -93,6 +93,6 @@ extern const char *glibtop_descriptions_proc_kernel [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_PROCLIST_NUMBER	0
 #define GLIBTOP_PROCLIST_TOTAL	1
@@ -99,6 +99,6 @@ extern const char *glibtop_descriptions_proclist [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_PROC_MAP_NUMBER		0
 #define GLIBTOP_PROC_MAP_TOTAL		1
@@ -105,6 +105,6 @@ extern const char *glibtop_descriptions_proc_map [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_PROC_MEM_SIZE		0
 #define GLIBTOP_PROC_MEM_VSIZE		1
@@ -84,6 +84,6 @@ extern const char *glibtop_descriptions_proc_mem [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_PROC_SEGMENT_TEXT_RSS		0
 #define GLIBTOP_PROC_SEGMENT_SHLIB_RSS		1
@@ -87,6 +87,6 @@ extern const char *glibtop_descriptions_proc_segment [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_PROC_SIGNAL_SIGNAL	0
 #define GLIBTOP_PROC_SIGNAL_BLOCKED	1
@@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_proc_signal [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_PROC_STATE_CMD		0
 #define GLIBTOP_PROC_STATE_STATE	1
@@ -85,6 +85,6 @@ extern const char *glibtop_descriptions_proc_state [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_PROC_TIME_START_TIME	0
 #define GLIBTOP_PROC_TIME_RTIME		1
@@ -99,6 +99,6 @@ extern const char *glibtop_descriptions_proc_time [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_PROC_UID_UID		0
 #define GLIBTOP_PROC_UID_EUID		1
@@ -94,6 +94,6 @@ extern const char *glibtop_descriptions_proc_uid [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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);

-END_LIBGTOP_DECLS
+G_END_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>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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);

-END_LIBGTOP_DECLS
+G_END_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>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_IPC_SEMMAP	0
 #define GLIBTOP_IPC_SEMMNI	1
@@ -88,6 +88,6 @@ extern const char *glibtop_descriptions_sem_limits [];

 #endif

-END_LIBGTOP_DECLS
+G_END_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>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_IPC_SHMMAX	0
 #define GLIBTOP_IPC_SHMMIN	1
@@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_shm_limits [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 typedef struct _glibtop_signame	glibtop_signame;

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

 extern const glibtop_signame glibtop_sys_siglist [];

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_SWAP_TOTAL	0
 #define GLIBTOP_SWAP_USED	1
@@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_swap [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

 #include <glibtop.h>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_SYSDEPS_FEATURES	0
 #define GLIBTOP_SYSDEPS_CPU		1
@@ -105,6 +105,6 @@ extern const char *glibtop_descriptions_sysdeps [];

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

 #include <glib.h>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_SYSINFO_CPUINFO		0

@@ -59,6 +59,6 @@ struct _glibtop_sysinfo

 glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

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

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 typedef union _glibtop_union	glibtop_union;

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

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_UPTIME_UPTIME		0
 #define GLIBTOP_UPTIME_IDLETIME		1
@@ -72,6 +72,6 @@ extern const char *glibtop_descriptions_uptime [];

 #endif

-END_LIBGTOP_DECLS
+G_END_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)."

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #if _IN_LIBGTOP

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

 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

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

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_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);

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,3 @@
-LINK				= $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@

 INCLUDES			= @INCLUDES@

@@ -9,7 +8,7 @@ libgtop_2_0_la_SOURCES		= init.c open.c close.c command.c read.c \
 				  sysdeps.c

 libgtop_2_0_la_LDFLAGS		= $(LT_VERSION_INFO)
-libgtop_2_0_la_LIBADD		= $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib)
+libgtop_2_0_la_LIBADD		= $(GLIB_LIBS) $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib)

 BUILT_SOURCES			= lib.c

--- a/lib/command.c
+++ b/lib/command.c
@@ -26,7 +26,6 @@
 #include <glibtop/read_data.h>

 #include <glibtop/command.h>
-#include <glibtop/xmalloc.h>

 void *
 glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
@@ -66,7 +65,7 @@ glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
 			recv_size);

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

 		glibtop_read_l (server, response.data_size, ptr);

--- a/lib/init.c
+++ b/lib/init.c
@@ -22,7 +22,6 @@
 */

 #include <glibtop.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/sysdeps.h>
 #include <glibtop/parameter.h>

--- a/lib/inodedb.c
+++ b/lib/inodedb.c
@@ -23,7 +23,6 @@

 #include <glibtop.h>
 #include <glibtop/error.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/inodedb.h>

 #include <pwd.h>
--- a/lib/lib.pl
+++ b/lib/lib.pl
@@ -20,11 +20,14 @@ print '/* lib.c */';
 print "/* This is a generated file.  Please modify `lib.pl' */";
 print '';

+print '#include <config.h>';
+print '';
 print '#include <glibtop.h>';
 print '#include <glibtop/open.h>';
 print '';
 print '#include <glibtop/sysdeps.h>';
 print '#include <glibtop/union.h>';
+print '#include <libgnome/gnome-i18n.h>';
 print '';
 print '#include <glibtop/command.h>';

--- a/lib/open.c
+++ b/lib/open.c
@@ -26,7 +26,6 @@
 #include <glibtop/version.h>
 #include <glibtop/sysdeps.h>
 #include <glibtop/command.h>
-#include <glibtop/xmalloc.h>

 #include <glibtop/gnuserv.h>

--- a/lib/read.c
+++ b/lib/read.c
@@ -21,7 +21,10 @@
   Boston, MA 02111-1307, USA.
 */

+#include <config.h>
 #include <glibtop/read.h>
+#include <libgnome/gnome-i18n.h>
+

 /* Reads some data from server. */

--- a/lib/read_data.c
+++ b/lib/read_data.c
@@ -21,8 +21,10 @@
   Boston, MA 02111-1307, USA.
 */

-#include <glibtop/xmalloc.h>
+#include <config.h>
+
 #include <glibtop/read_data.h>
+#include <libgnome/gnome-i18n.h>

 /* Reads some data from server. */

@@ -54,7 +56,7 @@ glibtop_read_data_l (glibtop *server)

 	if (!size) return NULL;	

-	ptr = g_malloc (server, size);
+	ptr = g_malloc (size);
 	
 	if (server->socket) {
 		ret = recv (server->socket, ptr, size, 0);
--- a/lib/structures.pl
+++ b/lib/structures.pl
@@ -65,7 +65,7 @@ print qq[\#define __GLIBTOP_STRUCTURES_H__];
 print '';
 print qq[\#include <glibtop.h>];
 print '';
-print qq[BEGIN_LIBGTOP_DECLS];
+print qq[G_BEGIN_DECLS];
 print '';

 for ($nr = 0; $nr < $structure_count; $nr++) {
@@ -77,7 +77,7 @@ for ($nr = 0; $nr < $structure_count; $nr++) {
 print '';
 printf (qq[\#define %-40s\t%d\n], 'GLIBTOP_MAX_STRUCTURES', $structure_count);
 print '';
-print qq[END_LIBGTOP_DECLS];
+print qq[G_END_DECLS];
 print '';
 print qq[\#endif /* __GLIBTOP_STRUCTURES_H__ */];

--- a/lib/write.c
+++ b/lib/write.c
@@ -21,7 +21,10 @@
   Boston, MA 02111-1307, USA.
 */

+#include <config.h>
+
 #include <glibtop/write.h>
+#include <libgnome/gnome-i18n.h>

 /* Writes some data to server. */

--- a/src/daemon/ChangeLog
+++ b/src/daemon/ChangeLog
@@ -1,3 +1,9 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* Makefile.am:
+	* daemon.h:
+	* gnuserv.c: (main): fixed compilation
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>

 	* main.c: (handle_parent_connection):
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -43,7 +43,7 @@ libgtop_daemon2_LDADD		= $(top_builddir)/lib/libgtop-2.0.la \
 				  @libs_xauth@

 libgtop_server2_SOURCES		= server.c slave.c io.c version.c daemon.h
-libgtop_server2_LDADD		= $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \
+libgtop_server2_LDADD		= $(GLIB_LIBS) $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \
 				  $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la

 EXTRA_DIST			= server_config.h.in server_config.pl
--- a/src/daemon/daemon.h
+++ b/src/daemon/daemon.h
@@ -30,7 +30,6 @@

 #include <glibtop/open.h>
 #include <glibtop/union.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/version.h>
 #include <glibtop/command.h>
 #include <glibtop/parameter.h>
@@ -40,7 +39,7 @@
 #include <sys/socket.h>
 #include <syslog.h>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 /* Some don't have LOG_PERROR */
 #ifndef LOG_PERROR
@@ -76,6 +75,6 @@ void syslog_io_message (int priority, char *format, ...);
 extern int enable_debug;
 extern int verbose_output;

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif
--- a/src/daemon/gnuserv.c
+++ b/src/daemon/gnuserv.c
@@ -29,11 +29,14 @@
 * ../etc/gnuserv.README relative to the directory containing this file)
 */

+#include <config.h>
+
+#include <libgnome/gnome-i18n.h>
 #include <glibtop.h>
 #include <glibtop/open.h>
 #include <glibtop/close.h>
 #include <glibtop/command.h>
-#include <glibtop/xmalloc.h>
+

 #include <glibtop/parameter.h>

@@ -461,7 +464,7 @@ const struct poptOption popt_options [] = {
 };

 int
-main (int argc, char *argv [])
+main (int argc, const char **argv)
 {
    const unsigned method = GLIBTOP_METHOD_PIPE;
    const unsigned long features = GLIBTOP_SYSDEPS_ALL;
@@ -475,7 +478,7 @@ main (int argc, char *argv [])
    if (!program_invocation_name) {
 	char *arg;
 	  
-	program_invocation_name = argv[0];
+	program_invocation_name = (char *) argv[0];
 	arg = strrchr (argv[0], '/');
 	program_invocation_short_name =
 	    arg ? (arg + 1) : program_invocation_name;
--- a/sysdeps/aix/ChangeLog
+++ b/sysdeps/aix/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* glibtop_machine.h:
+	* glibtop_server.h:
+	* glibtop_suid.h:
+	* procargs.c:
+	* proclist.c:
+	* procmap.c:
+	* utils.c:
+	* utils.h: fixed compilation
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>

 	* procargs.c: (glibtop_get_proc_args_s):
--- a/sysdeps/aix/glibtop_machine.h
+++ b/sysdeps/aix/glibtop_machine.h
@@ -26,7 +26,7 @@

 #include <procinfo.h>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 typedef struct _glibtop_machine glibtop_machine;

@@ -48,6 +48,6 @@ struct _glibtop_machine
 	struct procsinfo last_pinfo;
 };

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif /* __GLIBTOP_MACHINE_H__ */
--- a/sysdeps/aix/glibtop_server.h
+++ b/sysdeps/aix/glibtop_server.h
@@ -24,7 +24,7 @@
 #ifndef __GLIBTOP_SERVER_H__
 #define __GLIBTOP_SERVER_H__

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_SUID_CPU		(1 << GLIBTOP_SYSDEPS_CPU)
 #define GLIBTOP_SUID_MEM		0
@@ -47,6 +47,6 @@ BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_SUID_NETLOAD		(1 << GLIBTOP_SYSDEPS_NETLOAD)
 #define GLIBTOP_SUID_PPP		0

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif
--- a/sysdeps/aix/glibtop_suid.h
+++ b/sysdeps/aix/glibtop_suid.h
@@ -24,7 +24,7 @@
 #ifndef __GLIBTOP_SUID_H__
 #define __GLIBTOP_SUID_H__

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #if _IN_LIBGTOP
 #include <sys/param.h>
@@ -47,6 +47,6 @@ glibtop_open_p (glibtop *server, const char *program_name,
 		const unsigned long features,
 		const unsigned flags);

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif
--- a/sysdeps/aix/procargs.c
+++ b/sysdeps/aix/procargs.c
@@ -25,7 +25,6 @@

 #include <glibtop.h>
 #include <glibtop/error.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/procargs.h>

 #include "utils.h"
--- a/sysdeps/aix/proclist.c
+++ b/sysdeps/aix/proclist.c
@@ -24,7 +24,6 @@
 #include <procinfo.h>

 #include <glibtop.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/proclist.h>

 static const unsigned long _glibtop_sysdeps_proclist = 
--- a/sysdeps/aix/procmap.c
+++ b/sysdeps/aix/procmap.c
@@ -24,7 +24,6 @@

 #include <glibtop.h>
 #include <glibtop/error.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/procmap.h>

 static const unsigned long _glibtop_sysdeps_proc_map = 0;
--- a/sysdeps/aix/utils.c
+++ b/sysdeps/aix/utils.c
@@ -29,7 +29,6 @@

 #include <glibtop.h>
 #include <glibtop/error.h>
-#include <glibtop/xmalloc.h>
 #include "glibtop_suid.h"
 #include "utils.h"

--- a/sysdeps/aix/utils.h
+++ b/sysdeps/aix/utils.h
@@ -24,7 +24,7 @@
 #ifndef __UTILS_H__
 #define __UTILS_H__

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 extern off_t 
 _glibtop_get_kmem_offset(glibtop* server, char* kname);
@@ -40,6 +40,6 @@ extern  int
 _glibtop_vmgetinfo (void *out, int command, int arg);
 #endif

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif /* __UTILS_H__ */
--- a/sysdeps/common/ChangeLog
+++ b/sysdeps/common/ChangeLog
@@ -1,3 +1,8 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* inodedb.c:
+	* mountlist.c: (glibtop_get_mountlist_s): fixed compilation
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>

 	* Makefile.am:
--- a/sysdeps/common/inodedb.c
+++ b/sysdeps/common/inodedb.c
@@ -23,7 +23,6 @@

 #include <glibtop.h>
 #include <glibtop/error.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/inodedb.h>

 #include <pwd.h>
--- a/sysdeps/common/mountlist.c
+++ b/sysdeps/common/mountlist.c
@@ -19,6 +19,7 @@
 #include <config.h>
 #endif

+#include <glib.h>
 #include <stdio.h>
 #include <sys/types.h>
 #include "mountlist.h"
@@ -35,20 +36,10 @@ void free ();
 #endif

 #include <glibtop.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/mountlist.h>

 static struct mount_entry *read_filesystem_list (int need_fs_type, int all_fs);

-#undef xmalloc
-#undef xrealloc
-#undef xstrdup
-
-#define xmalloc(p1)	g_malloc (NULL, p1)
-#define xrealloc(p1,p2)	g_realloc (p1, p2)
-#define xstrdup(p1)	g_strdup (NULL, p1)
-#define xfree(p1)	g_free (NULL, p1)
-
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
@@ -264,7 +255,7 @@ read_filesystem_list (need_fs_type, all_fs)
  struct mount_entry *mtail;

  /* Start the list off with a dummy entry. */
-  me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
+  me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
  me->me_next = NULL;
  mount_list = mtail = me;

@@ -284,10 +275,10 @@ read_filesystem_list (need_fs_type, all_fs)
    p = mntlist;
    while(p){
      mnt = p->ment;
-      me = (struct mount_entry*) xmalloc(sizeof (struct mount_entry));
-      me->me_devname = xstrdup(mnt->mnt_fsname);
-      me->me_mountdir = xstrdup(mnt->mnt_dir);
-      me->me_type = xstrdup(mnt->mnt_type);
+      me = (struct mount_entry*) g_malloc(sizeof (struct mount_entry));
+      me->me_devname = g_strdup(mnt->mnt_fsname);
+      me->me_mountdir = g_strdup(mnt->mnt_dir);
+      me->me_type = g_strdup(mnt->mnt_type);
      me->me_dev = -1;
      me->me_next = NULL;
      mtail->me_next = me;
@@ -315,10 +306,10 @@ read_filesystem_list (need_fs_type, all_fs)
 			|| !strcmp (mnt->mnt_type, "auto")))
 	  continue;

-	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
-	me->me_devname = xstrdup (mnt->mnt_fsname);
-	me->me_mountdir = xstrdup (mnt->mnt_dir);
-	me->me_type = xstrdup (mnt->mnt_type);
+	me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
+	me->me_devname = g_strdup (mnt->mnt_fsname);
+	me->me_mountdir = g_strdup (mnt->mnt_dir);
+	me->me_type = g_strdup (mnt->mnt_type);
 	devopt = strstr (mnt->mnt_opts, "dev=");
 	if (devopt)
 	  {
@@ -351,13 +342,13 @@ read_filesystem_list (need_fs_type, all_fs)
      return NULL;
    while (entries-- > 0)
      {
-	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
-	me->me_devname = xstrdup (fsp->f_mntfromname);
-	me->me_mountdir = xstrdup (fsp->f_mntonname);
+	me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
+	me->me_devname = g_strdup (fsp->f_mntfromname);
+	me->me_mountdir = g_strdup (fsp->f_mntonname);
 #if defined(__NetBSD__) || defined(__OpenBSD__)
-	me->me_type = xstrdup (fsp->f_fstypename);
+	me->me_type = g_strdup (fsp->f_fstypename);
 #else
-	me->me_type = xstrdup (fstype_to_string (fsp->f_type));
+	me->me_type = g_strdup (fstype_to_string (fsp->f_type));
 #endif
 	me->me_dev = (dev_t) -1;	/* Magic; means not known yet. */
 	me->me_next = NULL;
@@ -379,10 +370,10 @@ read_filesystem_list (need_fs_type, all_fs)
    while ((val = getmnt (&offset, &fsd, sizeof (fsd), NOSTAT_MANY,
 			  (char *) 0)) > 0)
      {
-	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
-	me->me_devname = xstrdup (fsd.fd_req.devname);
-	me->me_mountdir = xstrdup (fsd.fd_req.path);
-	me->me_type = xstrdup (gt_names[fsd.fd_req.fstype]);
+	me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
+	me->me_devname = g_strdup (fsd.fd_req.devname);
+	me->me_mountdir = g_strdup (fsd.fd_req.path);
+	me->me_type = g_strdup (gt_names[fsd.fd_req.fstype]);
 	me->me_dev = fsd.fd_req.dev;
 	me->me_next = NULL;

@@ -405,7 +396,7 @@ read_filesystem_list (need_fs_type, all_fs)
      return (NULL);

    bufsize = (1 + numsys) * sizeof (struct statfs);
-    stats = (struct statfs *)xmalloc (bufsize);
+    stats = (struct statfs *) g_malloc (bufsize);
    numsys = getfsstat (stats, bufsize, MNT_WAIT);

    if (numsys < 0)
@@ -416,10 +407,10 @@ read_filesystem_list (need_fs_type, all_fs)

    for (counter = 0; counter < numsys; counter++)
      {
-	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
-	me->me_devname = xstrdup (stats[counter].f_mntfromname);
-	me->me_mountdir = xstrdup (stats[counter].f_mntonname);
-	me->me_type = xstrdup (mnt_names[stats[counter].f_type]);
+	me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
+	me->me_devname = g_strdup (stats[counter].f_mntfromname);
+	me->me_mountdir = g_strdup (stats[counter].f_mntonname);
+	me->me_type = g_strdup (mnt_names[stats[counter].f_type]);
 	me->me_dev = (dev_t) -1;	/* Magic; means not known yet. */
 	me->me_next = NULL;

@@ -444,17 +435,17 @@ read_filesystem_list (need_fs_type, all_fs)

    while (fread (&mnt, sizeof mnt, 1, fp) > 0)
      {
-	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
+	me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
 #ifdef GETFSTYP			/* SVR3.  */
-	me->me_devname = xstrdup (mnt.mt_dev);
+	me->me_devname = g_strdup (mnt.mt_dev);
 #else
-	me->me_devname = xmalloc (strlen (mnt.mt_dev) + 6);
+	me->me_devname = g_malloc (strlen (mnt.mt_dev) + 6);
 	strcpy (me->me_devname, "/dev/");
 	strcpy (me->me_devname + 5, mnt.mt_dev);
 #endif
-	me->me_mountdir = xstrdup (mnt.mt_filsys);
+	me->me_mountdir = g_strdup (mnt.mt_filsys);
 	me->me_dev = (dev_t) -1;	/* Magic; means not known yet. */
-	me->me_type = xstrdup ("");
+	me->me_type = g_strdup ("");
 #ifdef GETFSTYP			/* SVR3.  */
 	if (need_fs_type)
 	  {
@@ -463,7 +454,7 @@ read_filesystem_list (need_fs_type, all_fs)

 	    if (statfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1
 		&& sysfs (GETFSTYP, fsd.f_fstyp, typebuf) != -1)
-	      me->me_type = xstrdup (typebuf);
+	      me->me_type = g_strdup (typebuf);
 	  }
 #endif
 	me->me_next = NULL;
@@ -483,10 +474,10 @@ read_filesystem_list (need_fs_type, all_fs)
    struct mntent **mnttbl=getmnttbl(),**ent;
    for (ent=mnttbl;*ent;ent++)
      {
-	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
-	me->me_devname = xstrdup ( (*ent)->mt_resource);
-	me->me_mountdir = xstrdup( (*ent)->mt_directory);
-	me->me_type =  xstrdup ((*ent)->mt_fstype);
+	me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
+	me->me_devname = g_strdup ( (*ent)->mt_resource);
+	me->me_mountdir = g_strdup( (*ent)->mt_directory);
+	me->me_type =  g_strdup ((*ent)->mt_fstype);
 	me->me_dev = (dev_t) -1;	/* Magic; means not known yet. */
 	me->me_next = NULL;

@@ -511,10 +502,10 @@ read_filesystem_list (need_fs_type, all_fs)

    while ((ret = getmntent (fp, &mnt)) == 0)
      {
-	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
-	me->me_devname = xstrdup (mnt.mnt_special);
-	me->me_mountdir = xstrdup (mnt.mnt_mountp);
-	me->me_type = xstrdup (mnt.mnt_fstype);
+	me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
+	me->me_devname = g_strdup (mnt.mnt_special);
+	me->me_mountdir = g_strdup (mnt.mnt_mountp);
+	me->me_type = g_strdup (mnt.mnt_fstype);
 	me->me_dev = (dev_t) -1;	/* Magic; means not known yet. */
 	me->me_next = NULL;

@@ -538,7 +529,7 @@ read_filesystem_list (need_fs_type, all_fs)

    /* Ask how many bytes to allocate for the mounted filesystem info.  */
    mntctl (MCTL_QUERY, sizeof bufsize, (struct vmount *) &bufsize);
-    entries = xmalloc (bufsize);
+    entries = g_malloc (bufsize);

    /* Get the list of mounted filesystems.  */
    mntctl (MCTL_QUERY, bufsize, (struct vmount *) entries);
@@ -547,7 +538,7 @@ read_filesystem_list (need_fs_type, all_fs)
 	 thisent += vmp->vmt_length)
      {
 	vmp = (struct vmount *) thisent;
-	me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry));
+	me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
 	if (vmp->vmt_flags & MNT_REMOTE)
 	  {
 	    char *host, *path;
@@ -555,18 +546,18 @@ read_filesystem_list (need_fs_type, all_fs)
 	    /* Prepend the remote pathname.  */
 	    host = thisent + vmp->vmt_data[VMT_HOSTNAME].vmt_off;
 	    path = thisent + vmp->vmt_data[VMT_OBJECT].vmt_off;
-	    me->me_devname = xmalloc (strlen (host) + strlen (path) + 2);
+	    me->me_devname = g_malloc (strlen (host) + strlen (path) + 2);
 	    strcpy (me->me_devname, host);
 	    strcat (me->me_devname, ":");
 	    strcat (me->me_devname, path);
 	  }
 	else
 	  {
-	    me->me_devname = xstrdup (thisent +
+	    me->me_devname = g_strdup (thisent +
 				      vmp->vmt_data[VMT_OBJECT].vmt_off);
 	  }
-	me->me_mountdir = xstrdup (thisent + vmp->vmt_data[VMT_STUB].vmt_off);
-	me->me_type = xstrdup (fstype_to_string (vmp->vmt_gfstype));
+	me->me_mountdir = g_strdup (thisent + vmp->vmt_data[VMT_STUB].vmt_off);
+	me->me_type = g_strdup (fstype_to_string (vmp->vmt_gfstype));
 	me->me_dev = (dev_t) -1; /* vmt_fsid might be the info we want.  */
 	me->me_next = NULL;

@@ -613,7 +604,7 @@ glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs)

 	buf->total = buf->number * buf->size;

-	mount_list = g_malloc (server, buf->total);
+	mount_list = g_malloc (buf->total);

 	/* Write data into mount_list. */

@@ -634,10 +625,10 @@ glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs)

 	for (count = 0, tmp = me; tmp; count++, tmp = next) {
 		next = tmp->me_next;
-		xfree (tmp->me_devname);
-		xfree (tmp->me_mountdir);
-		xfree (tmp->me_type);
-		xfree (tmp);
+		g_free (tmp->me_devname);
+		g_free (tmp->me_mountdir);
+		g_free (tmp->me_type);
+		g_free (tmp);
 	}

 	return mount_list;
--- a/sysdeps/freebsd/ChangeLog
+++ b/sysdeps/freebsd/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* glibtop_machine.h:
+	* glibtop_server.h:
+	* glibtop_suid.h:
+	* open.c:
+	* procargs.c:
+	* proclist.c:
+	* procmap.c:
+	* swap.c: fixed compilation
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>

 	* procargs.c: (glibtop_get_proc_args_p):
--- a/sysdeps/freebsd/glibtop_machine.h
+++ b/sysdeps/freebsd/glibtop_machine.h
@@ -39,7 +39,7 @@
 #include <osreldate.h>
 #endif

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 typedef struct _glibtop_machine glibtop_machine;

@@ -54,6 +54,6 @@ struct _glibtop_machine
 	kvm_t *kd;
 };

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif /* __GLIBTOP_MACHINE_H__ */
--- a/sysdeps/freebsd/glibtop_server.h
+++ b/sysdeps/freebsd/glibtop_server.h
@@ -24,7 +24,7 @@
 #ifndef __GLIBTOP_SERVER_H__
 #define __GLIBTOP_SERVER_H__

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_SUID_CPU		(1 << GLIBTOP_SYSDEPS_CPU)
 #define GLIBTOP_SUID_MEM		(1 << GLIBTOP_SYSDEPS_MEM)
@@ -47,6 +47,6 @@ BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_SUID_NETLOAD		(1 << GLIBTOP_SYSDEPS_NETLOAD)
 #define GLIBTOP_SUID_PPP		(1 << GLIBTOP_SYSDEPS_PPP)

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif
--- a/sysdeps/freebsd/glibtop_suid.h
+++ b/sysdeps/freebsd/glibtop_suid.h
@@ -24,7 +24,7 @@
 #ifndef __GLIBTOP_SUID_H__
 #define __GLIBTOP_SUID_H__

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #if _IN_LIBGTOP
 #include <sys/param.h>
@@ -53,6 +53,6 @@ glibtop_open_p (glibtop *server, const char *program_name,
 		const unsigned long features,
 		const unsigned flags);

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif
--- a/sysdeps/freebsd/open.c
+++ b/sysdeps/freebsd/open.c
@@ -23,7 +23,6 @@

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

 /* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */

--- a/sysdeps/freebsd/procargs.c
+++ b/sysdeps/freebsd/procargs.c
@@ -23,7 +23,6 @@

 #include <glibtop.h>
 #include <glibtop/error.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/procargs.h>

 #include <glibtop_suid.h>
--- a/sysdeps/freebsd/proclist.c
+++ b/sysdeps/freebsd/proclist.c
@@ -23,7 +23,6 @@

 #include <glibtop.h>
 #include <glibtop/error.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/proclist.h>

 #include <glibtop_suid.h>
--- a/sysdeps/freebsd/procmap.c
+++ b/sysdeps/freebsd/procmap.c
@@ -23,7 +23,6 @@

 #include <glibtop.h>
 #include <glibtop/error.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/procmap.h>

 #include <glibtop_suid.h>
--- a/sysdeps/freebsd/swap.c
+++ b/sysdeps/freebsd/swap.c
@@ -25,8 +25,6 @@
 #include <glibtop/error.h>
 #include <glibtop/swap.h>

-#include <glibtop/xmalloc.h>
-
 #include <glibtop_suid.h>

 static const unsigned long _glibtop_sysdeps_swap =
--- a/sysdeps/kernel/ChangeLog
+++ b/sysdeps/kernel/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-20  Bastien Nocera  <hadess@hadess.net>
+
+	* glibtop_private.h:
+	* glibtop_server.h:
+	* kernel.h:
+	* procargs.c:
+	* proclist.c:
+	* procmap.c: fixed compilation
+
 2003-10-20  Bastien Nocera  <hadess@hadess.net>

 	* proclist.c: (glibtop_get_proclist_s): replace all the xmalloc crap
--- a/sysdeps/kernel/glibtop_private.h
+++ b/sysdeps/kernel/glibtop_private.h
@@ -34,7 +34,7 @@
 #undef LIBGTOP_VERSION
 #include <linux/libgtop.h>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 int
 glibtop_get_proc_data_stat_s (glibtop *server, libgtop_stat_t *stat);
@@ -84,6 +84,6 @@ glibtop_get_proc_data_netload_s (glibtop *server,
 				 libgtop_netload_t *netload,
 				 const char *device);

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif /* __GLIBTOP_PRIVATE_H__ */
--- a/sysdeps/kernel/glibtop_server.h
+++ b/sysdeps/kernel/glibtop_server.h
@@ -24,7 +24,7 @@
 #ifndef __GLIBTOP_SERVER_H__
 #define __GLIBTOP_SERVER_H__

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 #define GLIBTOP_SUID_CPU		0
 #define GLIBTOP_SUID_MEM		0
@@ -47,6 +47,6 @@ BEGIN_LIBGTOP_DECLS
 #define GLIBTOP_SUID_NETLOAD		0
 #define GLIBTOP_SUID_PPP		0

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif
--- a/sysdeps/kernel/kernel.h
+++ b/sysdeps/kernel/kernel.h
@@ -31,10 +31,10 @@

 #include <syscall.h>

-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS

 extern int table (int, union table *, const void *);

-END_LIBGTOP_DECLS
+G_END_DECLS

 #endif
--- a/sysdeps/kernel/procargs.c
+++ b/sysdeps/kernel/procargs.c
@@ -23,7 +23,6 @@

 #include <glibtop.h>
 #include <glibtop/error.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/procargs.h>

 static const unsigned long _glibtop_sysdeps_proc_args = 0;
--- a/sysdeps/kernel/proclist.c
+++ b/sysdeps/kernel/proclist.c
@@ -22,7 +22,6 @@
 */

 #include <glibtop.h>
-#include <glibtop/xmalloc.h>
 #include <glibtop/proclist.h>

 #include "kernel.h"
--- a/Show More
+++ b/Show More