Eliminate sim_client include of getopt.h

Commit 9139a60c94c24e41109574e84e7cda9c2dc3fb38 added an unconditional
include of getopt.h, which is non-portable (it isn't present on HP-UX)
and unecessary for getopt().  The same commit also disabled the
include of unistd.h (which is necessary for getopt()), as sim_client
no longer indirectly includes autoconf.  Make the unistd.h include
unconditional and remove the getopt.h include.

[ghudson@mit.edu: edited commit message]

(cherry picked from commit a6abaaf54925a4b63aff8c81da1a0af3a7c03466)

ticket: 9102
version_fixed: 1.21.3

diff --git a/src/appl/simple/client/sim_client.c b/src/appl/simple/client/sim_client.c
index ea1379e60eec6042088fb1348ddd1059439c0d1c..6f4283375652eea3cda455871fb7357f84cfefd6 100644 (file)
--- a/src/appl/simple/client/sim_client.c
+++ b/src/appl/simple/client/sim_client.c
@@ -39,10 +39,7 @@
 #include <string.h>
 #include <errno.h>
 #include <netdb.h>
-#include <getopt.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 
 #include "simple.h"