diff --git a/backends/sysdeps/ChangeLog b/backends/sysdeps/ChangeLog index 9f3490a6..be917a57 100644 --- a/backends/sysdeps/ChangeLog +++ b/backends/sysdeps/ChangeLog @@ -1,3 +1,12 @@ +2000-11-26 Martin Baulig + + * glibtop-backend-private.h: Removed. + + * backend-sysdeps.h: New files. + + * backend-sysdeps.c (_open_sysdeps): Don't overwrite + `backend->_priv'. + 2000-11-22 Martin Baulig * Makefile.am: Link libgtop_backend_sysdeps.la against diff --git a/backends/sysdeps/Makefile.am b/backends/sysdeps/Makefile.am index 1c6b6f2a..b5d399e6 100644 --- a/backends/sysdeps/Makefile.am +++ b/backends/sysdeps/Makefile.am @@ -16,7 +16,7 @@ backend_DATA = \ libgtop-sysdeps.backend noinst_HEADERS = \ - glibtop-backend-private.h + backend-sysdeps.h backendlib_LTLIBRARIES = \ libgtop_backend_sysdeps.la diff --git a/backends/sysdeps/backend-sysdeps.c b/backends/sysdeps/backend-sysdeps.c index c3955e24..70d273c5 100644 --- a/backends/sysdeps/backend-sysdeps.c +++ b/backends/sysdeps/backend-sysdeps.c @@ -23,11 +23,7 @@ Boston, MA 02111-1307, USA. */ -#include -#include -#include - -#include +#include static int _open_sysdeps (glibtop_server *, glibtop_backend *, u_int64_t, const char **); @@ -55,9 +51,6 @@ _open_sysdeps (glibtop_server *server, glibtop_backend *backend, { glibtop_init_func_t *init_fkt; - backend->_priv = glibtop_calloc_r - (server, 1, sizeof (glibtop_backend_private)); - /* Do the initialization, but only if not already initialized. */ if ((server->flags & _GLIBTOP_INIT_STATE_SYSDEPS) == 0) { diff --git a/backends/sysdeps/glibtop-backend-private.h b/backends/sysdeps/backend-sysdeps.h similarity index 87% rename from backends/sysdeps/glibtop-backend-private.h rename to backends/sysdeps/backend-sysdeps.h index 37234393..65a73da8 100644 --- a/backends/sysdeps/glibtop-backend-private.h +++ b/backends/sysdeps/backend-sysdeps.h @@ -23,16 +23,15 @@ Boston, MA 02111-1307, USA. */ -#ifndef __GLIBTOP_BACKEND_PRIVATE_H__ -#define __GLIBTOP_BACKEND_PRIVATE_H__ +#ifndef __GLIBTOP_BACKEND_SYSDEPS_H__ +#define __GLIBTOP_BACKEND_SYSDEPS_H__ + +#include +#include #include +#include #include #include -struct _glibtop_backend_private -{ - u_int64_t flags; -}; - #endif diff --git a/backends/sysdeps/marshal.pl b/backends/sysdeps/marshal.pl index 6f92186e..132581b9 100644 --- a/backends/sysdeps/marshal.pl +++ b/backends/sysdeps/marshal.pl @@ -24,17 +24,13 @@ print '/* marshal.c */'; print "/* This is a generated file. Please modify `marshal.pl' */"; print ''; -print '#include '; -print '#include '; -print '#include '; +print '#include '; print ''; print '#include '; print '#include '; print ''; print '#include '; print ''; -print '#include '; -print ''; $feature_count = 0;