- fixed compilation

This commit is contained in:
Bastien Nocera
2003-10-20 15:20:16 +00:00
parent ba36a20cb8
commit b67e4c7f7d
166 changed files with 434 additions and 333 deletions

View File

@@ -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):

View File

@@ -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

View File

@@ -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

View File

@@ -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;