summaryrefslogtreecommitdiff
path: root/sysdeps/stub_suid
diff options
context:
space:
mode:
authorBastien Nocera <hadess@src.gnome.org>2003-10-20 15:20:16 +0000
committerBastien Nocera <hadess@src.gnome.org>2003-10-20 15:20:16 +0000
commitb67e4c7f7d1a78e3e21b46955097eb33718bf461 (patch)
tree005dc92d623f76ab2c244e152770cd6db1b0a38d /sysdeps/stub_suid
parentba36a20cb81c8b3561b99a2412a9fd71b7cd8c12 (diff)
downloadlibgtop-b67e4c7f7d1a78e3e21b46955097eb33718bf461.tar.gz
- fixed compilation
Diffstat (limited to 'sysdeps/stub_suid')
-rw-r--r--sysdeps/stub_suid/ChangeLog9
-rw-r--r--sysdeps/stub_suid/glibtop_machine.h4
-rw-r--r--sysdeps/stub_suid/glibtop_server.h4
-rw-r--r--sysdeps/stub_suid/glibtop_suid.h4
-rw-r--r--sysdeps/stub_suid/open.c1
-rw-r--r--sysdeps/stub_suid/procargs.c1
-rw-r--r--sysdeps/stub_suid/procmap.c1
7 files changed, 15 insertions, 9 deletions
diff --git a/sysdeps/stub_suid/ChangeLog b/sysdeps/stub_suid/ChangeLog
index 4d7d7bec..71717038 100644
--- a/sysdeps/stub_suid/ChangeLog
+++ b/sysdeps/stub_suid/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-20 Bastien Nocera <hadess@hadess.net>
+
+ * glibtop_machine.h:
+ * glibtop_server.h:
+ * glibtop_suid.h:
+ * open.c:
+ * procargs.c:
+ * procmap.c: fixed compilation
+
2001-10-17 Abel Cheung <maddog@linux.org.hk>
* Makefile.am: move header to $(includedir)/libgtop-1.0/glibtop.
diff --git a/sysdeps/stub_suid/glibtop_machine.h b/sysdeps/stub_suid/glibtop_machine.h
index 835f177f..b2f5d250 100644
--- a/sysdeps/stub_suid/glibtop_machine.h
+++ b/sysdeps/stub_suid/glibtop_machine.h
@@ -24,7 +24,7 @@
#ifndef __GLIBTOP_MACHINE_H__
#define __GLIBTOP_MACHINE_H__
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
typedef struct _glibtop_machine glibtop_machine;
@@ -34,6 +34,6 @@ struct _glibtop_machine
gid_t gid, egid; /* Real and effective group id */
};
-END_LIBGTOP_DECLS
+G_END_DECLS
#endif
diff --git a/sysdeps/stub_suid/glibtop_server.h b/sysdeps/stub_suid/glibtop_server.h
index ccf3d29d..8bfa4a6c 100644
--- a/sysdeps/stub_suid/glibtop_server.h
+++ b/sysdeps/stub_suid/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
diff --git a/sysdeps/stub_suid/glibtop_suid.h b/sysdeps/stub_suid/glibtop_suid.h
index b88421ff..3753cba1 100644
--- a/sysdeps/stub_suid/glibtop_suid.h
+++ b/sysdeps/stub_suid/glibtop_suid.h
@@ -24,7 +24,7 @@
#ifndef __GLIBTOP_SUID_H__
#define __GLIBTOP_SUID_H__
-BEGIN_LIBGTOP_DECLS
+G_BEGIN_DECLS
static inline void glibtop_suid_enter (glibtop *server) {
setreuid (server->machine.uid, server->machine.euid);
@@ -43,6 +43,6 @@ glibtop_open_p (glibtop *server, const char *program_name,
const unsigned long features,
const unsigned flags);
-END_LIBGTOP_DECLS
+G_END_DECLS
#endif
diff --git a/sysdeps/stub_suid/open.c b/sysdeps/stub_suid/open.c
index 3357ad25..86c2ab6f 100644
--- a/sysdeps/stub_suid/open.c
+++ b/sysdeps/stub_suid/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 !!! */
diff --git a/sysdeps/stub_suid/procargs.c b/sysdeps/stub_suid/procargs.c
index 67c183e8..90d05c9c 100644
--- a/sysdeps/stub_suid/procargs.c
+++ b/sysdeps/stub_suid/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;
diff --git a/sysdeps/stub_suid/procmap.c b/sysdeps/stub_suid/procmap.c
index 0b9bd6e0..44d91b24 100644
--- a/sysdeps/stub_suid/procmap.c
+++ b/sysdeps/stub_suid/procmap.c
@@ -23,7 +23,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;