From c8cf438d44f7a4cd6700dbf9621329bffd960bf5 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Wed, 13 May 2009 23:27:00 +0000 Subject: Rename all feature flags to HAVE_* and move out of makefiles into a configure script which must be run before building. Still two makefiles but they are a hell of a lot simpler. HAVE_* also will make it easier to move to $buildsystem if necessary later. --- server.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'server.c') diff --git a/server.c b/server.c index dd418e11..eeca1f8e 100644 --- a/server.c +++ b/server.c @@ -1,4 +1,4 @@ -/* $Id: server.c,v 1.140 2009-05-04 17:58:27 nicm Exp $ */ +/* $Id: server.c,v 1.141 2009-05-13 23:27:00 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -129,7 +129,7 @@ server_start(char *path) mode_t mask; int n, fd, pair[2], mode; char *cause; -#ifndef NO_SETPROCTITLE +#ifdef HAVE_SETPROCTITLE char rpathbuf[MAXPATHLEN]; #endif @@ -181,7 +181,7 @@ server_start(char *path) log_debug("server started, pid %ld", (long) getpid()); log_debug("socket path %s", socket_path); -#ifndef NO_SETPROCTITLE +#ifdef HAVE_SETPROCTITLE if (realpath(socket_path, rpathbuf) == NULL) strlcpy(rpathbuf, socket_path, sizeof rpathbuf); setproctitle("server (%s)", rpathbuf); @@ -284,7 +284,7 @@ server_main(int srv_fd) pfd = pfds; /* Handle server socket. */ -#ifndef BROKEN_POLL +#ifdef HAVE_POLL if (pfd->revents & (POLLERR|POLLNVAL|POLLHUP)) fatalx("lost server socket"); #endif -- cgit