Get getopt from unistd.h (not getopt.h) in tests

POSIX defines getopt to be declared in unistd.h, and HP-UX (as of
version 11.31) does not appear to have getopt.h.  In test programs
which currently include getopt.h and aren't currently built on
Windows, include unistd.h or just assume we will get it via k5-int.h.

(cherry picked from commit 613c62d689c31a325d51be88657dedd17af3cf81)

ticket: 7894
version_fixed: 1.12.2
status: resolved

diff --git a/src/lib/krb5/krb/t_cc_config.c b/src/lib/krb5/krb/t_cc_config.c
index 156a5b5d9730ed91725702f05ba6b1facbd7cefe..51d1ef5a32214f7552cd9f40013ff1e9908a69d8 100644 (file)
--- a/src/lib/krb5/krb/t_cc_config.c
+++ b/src/lib/krb5/krb/t_cc_config.c
@@ -37,7 +37,6 @@
 
 #include <k5-int.h>
 #include "int-proto.h"
-#include <getopt.h>
 
 static void
 bail_on_err(krb5_context context, const char *msg, krb5_error_code code)

diff --git a/src/lib/krb5/krb/t_in_ccache.c b/src/lib/krb5/krb/t_in_ccache.c
index 30b7f281a9b0f948f37212533f41aaf6d0f04d53..0bb203fe5b32a377f2d958c31a86220236526a3e 100644 (file)
--- a/src/lib/krb5/krb/t_in_ccache.c
+++ b/src/lib/krb5/krb/t_in_ccache.c
@@ -36,7 +36,6 @@
  */
 
 #include "k5-int.h"
-#include <getopt.h>
 
 static void
 bail_on_err(krb5_context context, const char *msg, krb5_error_code code)

diff --git a/src/tests/gssapi/t_enctypes.c b/src/tests/gssapi/t_enctypes.c
index 79a732a2b487b0d230c84caeaee1d64fa73a0f18..63ca79a8ef9fe9fbbf2fbf00a1937d1d97060719 100644 (file)
--- a/src/tests/gssapi/t_enctypes.c
+++ b/src/tests/gssapi/t_enctypes.c
@@ -33,7 +33,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <getopt.h>
 #include "k5-int.h"
 #include "common.h"
 

diff --git a/src/tests/responder.c b/src/tests/responder.c
index 13623d832459dd5bd0357cc9b89a239062a99e1b..d17fdaed661f802631a4ebf3a93762b8ba2a8c0b 100644 (file)
--- a/src/tests/responder.c
+++ b/src/tests/responder.c
@@ -56,7 +56,7 @@
  */
 
 #include <sys/types.h>
-#include <getopt.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
 #include <krb5.h>