diff options
| author | Guillem Jover <guillem@hadrons.org> | 2011-05-28 11:40:36 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@hadrons.org> | 2011-05-29 02:41:16 +0200 |
| commit | b0eb19970a2953e4f689e4d7584e78595ef93622 (patch) | |
| tree | 1e92a745b6e32fc72315c069200afb078eb6bbfa | |
| parent | 0bf3d3913fe2adb5974add44f93a5de78bd06710 (diff) | |
Move bsd_getopt() from <bsd/getopt.h> to <bsd/unistd.h>
Deprecate <bsd/getopt.h>.
| -rw-r--r-- | include/bsd/getopt.h | 19 | ||||
| -rw-r--r-- | include/bsd/unistd.h | 10 |
2 files changed, 14 insertions, 15 deletions
diff --git a/include/bsd/getopt.h b/include/bsd/getopt.h index ba2c4eb..697f940 100644 --- 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 61aaff4..1c4e579 100644 --- 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); |