summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOBATA Akio <obache@wizdas.com>2019-04-18 18:40:08 +0900
committerSlávek Banko <slavek.banko@axis.cz>2019-04-21 15:35:21 +0200
commit1a69923c0ab462a50578e1e00554efeab58b95a5 (patch)
tree6a12b8364946a879a2dbbced2f2bc23f17b3f519
parent9e4dd173abc8d87171d7c7cee5840517aac0cd39 (diff)
downloadtdenetwork-1a69923c0ab462a50578e1e00554efeab58b95a5.tar.gz
tdenetwork-1a69923c0ab462a50578e1e00554efeab58b95a5.zip
Change to just include <utmpx.h> over <utmp.h>
Including deprecated <utmp.h> over standard <utmpx.h> may cause unwanted side effects, for example, enables old-code-compatibility functions and override utmpx functions. Signed-off-by: OBATA Akio <obache@wizdas.com> (cherry picked from commit 2c18879814fa01d3bd9de69625c8ff1791f793b6)
-rw-r--r--ktalkd/ktalkd/includ.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/ktalkd/ktalkd/includ.h b/ktalkd/ktalkd/includ.h
index 923b452d..f26d21be 100644
--- a/ktalkd/ktalkd/includ.h
+++ b/ktalkd/ktalkd/includ.h
@@ -55,11 +55,10 @@
#define NEW_CTL_RESPONSE CTL_RESPONSE
#include "otalkd.h"
-#ifdef HAVE_UTMP_H
-#include <utmp.h>
-#endif
#ifdef HAVE_UTMPX_H
#include <utmpx.h>
+#elif defined HAVE_UTMP_H
+#include <utmp.h>
#endif
#ifndef UT_LINESIZE
#define UT_LINESIZE 12