From e4673b3fc08d4a7fafc75233b59f7e1f5be9bd99 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Thu, 25 Aug 2016 06:26:24 -0700 Subject: [PATCH] ircd: Remove the restart.h header (temp merge into ircd.h). --- include/ircd/ircd.h | 3 +++ include/ircd/restart.h | 35 ----------------------------------- include/ircd/stdinc.h | 1 - 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 include/ircd/restart.h diff --git a/include/ircd/ircd.h b/include/ircd/ircd.h index 9fdf6fe96..110293eb2 100644 --- a/include/ircd/ircd.h +++ b/include/ircd/ircd.h @@ -99,6 +99,9 @@ extern bool ircd_ssl_ok; extern bool ircd_zlib_ok; extern int maxconnections; +void restart(const char *) __attribute__((noreturn)); +void server_reboot(void) __attribute__((noreturn)); + void setup_signals(); void ircd_shutdown(const char *reason) __attribute__((noreturn)); diff --git a/include/ircd/restart.h b/include/ircd/restart.h deleted file mode 100644 index 1b56fa37b..000000000 --- a/include/ircd/restart.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * ircd-ratbox: A slightly useful ircd. - * restart.h: A header with restart functions. - * - * Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center - * Copyright (C) 1996-2002 Hybrid Development Team - * Copyright (C) 2002-2004 ircd-ratbox development team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA - */ - -#pragma once -#define HAVE_IRCD_RESTART_H - -#ifdef __cplusplus -namespace ircd { - -void restart(const char *) __attribute__((noreturn)); -void server_reboot(void) __attribute__((noreturn)); - -} // namespace ircd -#endif // __cplusplus diff --git a/include/ircd/stdinc.h b/include/ircd/stdinc.h index 222c0f4ab..e990069c7 100644 --- a/include/ircd/stdinc.h +++ b/include/ircd/stdinc.h @@ -108,7 +108,6 @@ namespace ircd #include "privilege.h" #include "ratelimit.h" #include "reject.h" -#include "restart.h" #include "s_conf.h" #include "send.h" #include "s_newconf.h"