summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2017-08-12 17:36:22 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2017-08-12 17:36:22 +0000
commit6f3032f5e11215d8373d631547af004c1276ae2f (patch)
treee94be5a4930a3ffab0c3bb8bc44d559d00c313f0
parentd2ef968f63c0d0a67ee07e370dd989917105328b (diff)
sig_atomic_t is not (necessarily) an int. Use
SIG_ATOMIC_MAX for INTERNALSIG instead of INT_MAX.
-rw-r--r--sbin/dhclient/dhcpd.h4
-rw-r--r--sbin/dhclient/dispatch.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/sbin/dhclient/dhcpd.h b/sbin/dhclient/dhcpd.h
index 47a1e63bc59..a766a7e4b52 100644
--- a/sbin/dhclient/dhcpd.h
+++ b/sbin/dhclient/dhcpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhcpd.h,v 1.222 2017/08/10 17:15:05 krw Exp $ */
+/* $OpenBSD: dhcpd.h,v 1.223 2017/08/12 17:36:21 krw Exp $ */
/*
* Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -41,7 +41,7 @@
#define LOCAL_PORT 68
#define REMOTE_PORT 67
-#define INTERNALSIG INT_MAX
+#define INTERNALSIG SIG_ATOMIC_MAX
#define DB_TIMEFMT "%w %Y/%m/%d %T UTC"
struct option_data {
diff --git a/sbin/dhclient/dispatch.c b/sbin/dhclient/dispatch.c
index f7792c86cde..e5910aa187f 100644
--- a/sbin/dhclient/dispatch.c
+++ b/sbin/dhclient/dispatch.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dispatch.c,v 1.137 2017/08/09 19:57:54 krw Exp $ */
+/* $OpenBSD: dispatch.c,v 1.138 2017/08/12 17:36:21 krw Exp $ */
/*
* Copyright 2004 Henning Brauer <henning@openbsd.org>
@@ -60,6 +60,7 @@
#include <poll.h>
#include <signal.h>
#include <stdio.h>
+#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>