From: Richard Russon <rich@flatcap.org>
Date: Mon, 1 May 2017 01:47:23 +0000 (+0100)
Subject: use basic getopt from unistd.h
X-Git-Tag: neomutt-20170526~38^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a1caf614f26dd49ed56695c6758636e83568d73;p=neomutt

use basic getopt from unistd.h

getopt() is defined in <unistd.h>
<getopt.h> would only be needed if we used getopt_long()
---

diff --git a/configure.ac b/configure.ac
index bfa8fccdc..c277e21df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -458,8 +458,6 @@ AC_CHECK_DECLS([sys_siglist],[],[],[#include <signal.h>
 
 AC_REPLACE_FUNCS([wcscasecmp strcasestr])
 
-AC_CHECK_HEADERS(getopt.h)
-
 dnl Set the atime of files
 AC_CHECK_FUNCS(futimens)
 
diff --git a/doc/makedoc.c b/doc/makedoc.c
index 34a55407b..09e01cf2b 100644
--- a/doc/makedoc.c
+++ b/doc/makedoc.c
@@ -36,9 +36,6 @@
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
 
 #ifndef HAVE_STRERROR
 #define strerror(x) ((x) > 0 && (x) < sys_nerr) ? sys_errlist[(x)] : 0
diff --git a/dotlock.c b/dotlock.c
index 76705fb4c..12a6f5823 100644
--- a/dotlock.c
+++ b/dotlock.c
@@ -37,9 +37,6 @@
 #include <time.h>
 #include <unistd.h>
 #include "dotlock.h"
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
 #ifndef _POSIX_PATH_MAX
 #include <limits.h>
 #endif
diff --git a/main.c b/main.c
index 36bc8e729..23eff3520 100644
--- a/main.c
+++ b/main.c
@@ -52,9 +52,6 @@
 #endif
 
 
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
 #ifdef HAVE_STRINGPREP_H
 #include <stringprep.h>
 #elif defined(HAVE_IDN_STRINGPREP_H)
diff --git a/pgppubring.c b/pgppubring.c
index a6c902a35..81d3a24c9 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -42,9 +42,6 @@
 #include "pgplib.h"
 #include "pgppacket.h"
 #include "sha1.h"
-#ifdef HAVE_GETOPT_H
-#include <getopt.h>
-#endif
 
 extern char *optarg;
 extern int optind;