blkid, uuidd, uuidgen: assume getopt.h and getopt.h are available

These headers are in use allover this project without issues.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>

diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index bbe7b6267711795ae278ab2b1aceef523eb84a46..c0be45746f45ba041e2ebb3665c0167916cba8a4 100644 (file)
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -17,13 +17,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <errno.h>
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-extern int getopt(int argc, char * const argv[], const char *optstring);
-extern char *optarg;
-extern int optind;
-#endif
 
 #define OUTPUT_VALUE_ONLY      (1 << 1)
 #define OUTPUT_DEVICE_ONLY     (1 << 2)

diff --git a/misc-utils/uuidd.c b/misc-utils/uuidd.c
index 76f5e413105c16ad61f1b06b0ef0b6f19c240e84..e19be52cdb1e9ff849a195f2d4aeeb12f7fcf04e 100644 (file)
--- a/misc-utils/uuidd.c
+++ b/misc-utils/uuidd.c
@@ -9,9 +9,7 @@
  * %End-Header%
  */
 #include <stdio.h>
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
 #include <unistd.h>
 #include <inttypes.h>
 #include <errno.h>
@@ -23,13 +21,7 @@
 #include <fcntl.h>
 #include <signal.h>
 #include <string.h>
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-extern int getopt(int argc, char * const argv[], const char *optstring);
-extern char *optarg;
-extern int optind;
-#endif
 
 #include "uuid.h"
 #include "uuidd.h"

diff --git a/misc-utils/uuidgen.c b/misc-utils/uuidgen.c
index 54c5773aa7e206d3f66b1bfec4e42f3dad50c9a6..40b00ffeb250f3578ef40e89e9dfa6b572486518 100644 (file)
--- a/misc-utils/uuidgen.c
+++ b/misc-utils/uuidgen.c
@@ -10,16 +10,8 @@
  */
 
 #include <stdio.h>
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
-#ifdef HAVE_GETOPT_H
 #include <getopt.h>
-#else
-extern int getopt(int argc, char * const argv[], const char *optstring);
-extern char *optarg;
-extern int optind;
-#endif
 
 #include "uuid.h"
 #include "nls.h"