Move bsd_getopt() from <bsd/getopt.h> to <bsd/unistd.h>

Deprecate <bsd/getopt.h>.

diff --git a/include/bsd/getopt.h b/include/bsd/getopt.h
index ba2c4ebce6f3f4b4f5b4d48c1348e6aeb341249d..697f9407ae56b7bcc4f1716f5a740b9c3218c2f8 100644 (file)
--- a/include/bsd/getopt.h
+++ b/include/bsd/getopt.h
@@ -1,6 +1,5 @@
 /*
- * Copyright © 2006 Robert Millan
- * Copyright © 2009, 2011 Guillem Jover
+ * Copyright © 2011 Guillem Jover
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,23 +27,13 @@
 #ifndef LIBBSD_GETOPT_H
 #define LIBBSD_GETOPT_H
 
-#include <sys/cdefs.h>
-
 #ifdef LIBBSD_OVERLAY
 #include_next <getopt.h>
+#include <unistd.h>
 #else
+#warning "Deprecated header, use <bsd/unistd.h> or <unistd.h> with libbsd-overlay.pc instead."
 #include <getopt.h>
+#include <bsd/unistd.h>
 #endif
 
-__BEGIN_DECLS
-extern int optreset;
-
-#ifdef LIBBSD_OVERLAY
-#undef getopt
-#define getopt(argc, argv, optstr) bsd_getopt(argc, argv, optstr)
-#endif
-
-int bsd_getopt (int, char **, char *);
-__END_DECLS
-
 #endif

diff --git a/include/bsd/unistd.h b/include/bsd/unistd.h
index 61aaff47d82038fe506cc9221921ec8cbe7dfece..1c4e579a1f5bafac376c5890c11e60c18f3415a1 100644 (file)
--- a/include/bsd/unistd.h
+++ b/include/bsd/unistd.h
@@ -1,4 +1,5 @@
 /*
+ * Copyright © 2006 Robert Millan
  * Copyright © 2008-2011 Guillem Jover
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,6 +42,15 @@
 #endif
 
 __BEGIN_DECLS
+extern int optreset;
+
+#ifdef LIBBSD_OVERLAY
+#undef getopt
+#define getopt(argc, argv, optstr) bsd_getopt(argc, argv, optstr)
+#endif
+
+int bsd_getopt(int, char **, char *);
+
 mode_t getmode(const void *set, mode_t mode);
 void *setmode(const char *mode_str);