diff options
| author | Martin Baulig <baulig@suse.de> | 2001-04-20 17:38:28 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2001-04-20 17:38:28 +0000 |
| commit | c5fcc9aad67c670b9faf6582c8f52b37ddced722 (patch) | |
| tree | 7ebfd6ecd1505415593abf8bf8baa1109f194584 | |
| parent | f4fc67f85c71a4329f5939bd93cb4a5ea8afdd2c (diff) | |
| download | libgtop-c5fcc9aad67c670b9faf6582c8f52b37ddced722.tar.gz | |
Removed this typedef. (glibtop_server): Made the `_priv' field a `void *'.
2001-04-20 Martin Baulig <baulig@suse.de>
* include/glibtop/glibtop-server.h
(glibtop_server_private): Removed this typedef.
(glibtop_server): Made the `_priv' field a `void *'.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | include/glibtop/glibtop-server.h | 3 | ||||
| -rw-r--r-- | lib/Makefile.am | 1 | ||||
| -rw-r--r-- | lib/glibtop-server.c | 1 | ||||
| -rw-r--r-- | lib/test-backends.c | 2 |
6 files changed, 16 insertions, 6 deletions
@@ -1,5 +1,16 @@ 2001-04-20 Martin Baulig <baulig@suse.de> + * include/glibtop/glibtop-server.h + (glibtop_server_private): Removed this typedef. + (glibtop_server): Made the `_priv' field a `void *'. + + * glibtop-server-private.h: Moved to lib/. + + * lib/glibtop-server-private.h + (glibtop_server_private): Moved this typedef here. + +2001-04-20 Martin Baulig <baulig@suse.de> + * include/glibtop/*.h (glibtop_get_*_s, glibtop_get_*_pl): Added `void *closure' argument to all sysdeps functions. diff --git a/Makefile.am b/Makefile.am index 0a5282cb..93bbd833 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,12 +1,10 @@ ## Process this file with automake to produce Makefile.in. -SUBDIRS = po intl misc include lib sysdeps backends src doc dtd scripts +SUBDIRS = po intl misc include lib src doc dtd scripts include_HEADERS = glibtop.h configincludedir = $(pkglibdir)/include -noinst_HEADERS = glibtop-server-private.h - EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt libgtopConf.sh.in \ LIBGTOP-VERSION features.def structures.def libgtop-config.in \ RELNOTES-0.25 RELNOTES-1.0 RELNOTES-1.1.x libgtop-sysdeps.m4 README \ diff --git a/include/glibtop/glibtop-server.h b/include/glibtop/glibtop-server.h index a781ac88..57729e58 100644 --- a/include/glibtop/glibtop-server.h +++ b/include/glibtop/glibtop-server.h @@ -33,7 +33,6 @@ BEGIN_LIBGTOP_DECLS typedef struct _glibtop_server glibtop_server; typedef struct _glibtop_server_info glibtop_server_info; -typedef struct _glibtop_server_private glibtop_server_private; typedef int (*glibtop_init_func_t) (glibtop_server *); @@ -57,7 +56,7 @@ struct _glibtop_server unsigned flags; const char *name; - glibtop_server_private *_priv; + void *_priv; }; glibtop_server * diff --git a/lib/Makefile.am b/lib/Makefile.am index 18f08cc0..aa4fb748 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -11,6 +11,7 @@ noinst_LTLIBRARIES = libgtop_server.la libgtop_la_SOURCES = errors.c glibtop-backend-info.c \ glibtop-client.c glibtop-server.c \ glibtop-backend.c glibtop-client-private.h \ + glibtop-server-private.h \ $(BUILT_SOURCES) libgtop_server_la_SOURCES = error.c xmalloc.c diff --git a/lib/glibtop-server.c b/lib/glibtop-server.c index 66fbe471..d00b7983 100644 --- a/lib/glibtop-server.c +++ b/lib/glibtop-server.c @@ -24,6 +24,7 @@ */ #include <glibtop.h> +#include <glibtop-server-private.h> glibtop_server * glibtop_server_new (void) diff --git a/lib/test-backends.c b/lib/test-backends.c index db5cedaa..15ebb1f6 100644 --- a/lib/test-backends.c +++ b/lib/test-backends.c @@ -54,7 +54,7 @@ main (int argc, char *argv []) if (backend_common != NULL) glibtop_client_add_backend (client, backend_common); - backend_sysdeps = glibtop_backend_get ("glibtop-backend-sysdeps", + backend_sysdeps = glibtop_backend_get ("glibtop-backend-sysdeps-stub", 0, NULL, &error); if (error != NULL) { |