From 137fbd9b85b159bfbe429ffa46962661e78444dc Mon Sep 17 00:00:00 2001
From: Kevin Easton <keaston@users.sourceforge.net>
Date: Thu, 6 Nov 2014 10:44:07 +0000
Subject: [PATCH] Prefer <fcntl.h> over <sys/fcntl.h>.

<fcntl.h> is the name used by POSIX, so we prefer this and only fall back to
<sys/fcntl.h> on non-POSIX systems.  Fixes warnings compiling against musl
libc.

Reported by ncopa.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@531 13b04d17-f746-0410-82c6-800466cd88b0
---
 Changelog         |  2 ++
 include/irc.h     | 12 ++++++------
 include/irc_std.h |  8 ++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Changelog b/Changelog
index 20df177..7368ed2 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,7 @@
 [Changes 1.2c01]
 
+* Prefer <fcntl.h> over <sys/fcntl.h> (reported by ncopa). (caf)
+
 * Fix overflow in say() when handling a maximum-length client message. (caf)
 
 * Remove WANT_CHAN_NICK_SERV define and include network services commands 
diff --git a/include/irc.h b/include/irc.h
index f17d31c..8de9d41 100644
--- a/include/irc.h
+++ b/include/irc.h
@@ -78,13 +78,13 @@ extern char	thing_star[4];
 # endif /* HAVE_SYS_TIME_H */
 #endif /* TIME_WITH_SYS_TIME */
 
-#ifdef HAVE_SYS_FCNTL_H
-# include <sys/fcntl.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
 #else
-  #ifdef HAVE_FCNTL_H
-  #include <fcntl.h> 
-  #endif /* HAVE_FCNTL_H */
-#endif
+# ifdef HAVE_SYS_FCNTL_H
+#  include <sys/fcntl.h>
+# endif
+#endif /* HAVE_FCNTL_H */
 
 #include <stdarg.h>
 #include <unistd.h>
diff --git a/include/irc_std.h b/include/irc_std.h
index 960c3e3..85fa07e 100644
--- a/include/irc_std.h
+++ b/include/irc_std.h
@@ -62,11 +62,11 @@
 /*
  * Deal with brokenness in <fcntl.h> and <sys/fcntl.h>
  */
-#ifdef HAVE_SYS_FCNTL_H
-# include <sys/fcntl.h>
+#ifdef HAVE_FCNTL_H
+# include <fcntl.h>
 #else
-# ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
+# ifdef HAVE_SYS_FCNTL_H
+#  include <sys/fcntl.h>
 # endif
 #endif