diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | include/glibtop/open.h | 4 | ||||
| -rw-r--r-- | src/proxy/main.c | 2 | ||||
| -rw-r--r-- | src/server/main.c | 2 |
4 files changed, 10 insertions, 3 deletions
@@ -1,5 +1,10 @@ 1998-06-02 Martin Baulig <baulig@merkur.uni-trier.de> + * lib/open.c (glibtop_open): renamed to `glibtop_open__l'. + + * sysdeps/linux/open.c (glibtop_open): renamed to + `glibtop_open__r'. + * include/glibtop/open.h (GLIBTOP_OPEN_NO_OVERRIDE): tells `glibtop_open' to use the default server and not to check the environment variables. diff --git a/include/glibtop/open.h b/include/glibtop/open.h index 83674a55..629c18e8 100644 --- a/include/glibtop/open.h +++ b/include/glibtop/open.h @@ -28,7 +28,9 @@ __BEGIN_DECLS #define GLIBTOP_OPEN_NO_OVERRIDE 1 -extern void glibtop_open __P((glibtop *, const char *, const unsigned long, const unsigned)); +extern void glibtop_open__l __P((glibtop *, const char *, const unsigned long, const unsigned)); + +extern void glibtop_open__r __P((glibtop *, const char *, const unsigned long, const unsigned)); __END_DECLS diff --git a/src/proxy/main.c b/src/proxy/main.c index 3671b962..1eda5386 100644 --- a/src/proxy/main.c +++ b/src/proxy/main.c @@ -54,7 +54,7 @@ main(int argc, char *argv[]) glibtop_version (); - glibtop_open (&server, argv [0], 0, GLIBTOP_OPEN_NO_OVERRIDE); + glibtop_open__l (&server, argv [0], 0, GLIBTOP_OPEN_NO_OVERRIDE); /* close all file descriptors except ones used by the pipes (0 and 1). */ max_fd = GET_MAX_FDS(); diff --git a/src/server/main.c b/src/server/main.c index fd47da50..7dfc0c67 100644 --- a/src/server/main.c +++ b/src/server/main.c @@ -73,7 +73,7 @@ int main(int argc, char *argv[]) setreuid (uid, euid); setregid (gid, egid); - glibtop_open (&server, argv [0], 0, 0); + glibtop_open__r (&server, argv [0], 0, 0); if (setreuid (euid, uid)) _exit (1); |