generic-library/libbsd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libbsd/libbsd.git synced 2025-01-24 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Deprecate <bsd/getopt.h>.
This commit is contained in:
Guillem Jover 2011-05-28 11:40:36 +02:00
parent 0bf3d3913f
commit b0eb19970a
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
include/bsd/getopt.h
View File

@ -1,6 +1,5 @@
/* /*
* Copyright © 2006 Robert Millan * Copyright © 2011 Guillem Jover
* Copyright © 2009, 2011 Guillem Jover
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -28,23 +27,13 @@
#ifndef LIBBSD_GETOPT_H #ifndef LIBBSD_GETOPT_H
#define LIBBSD_GETOPT_H #define LIBBSD_GETOPT_H
#include <sys/cdefs.h>
#ifdef LIBBSD_OVERLAY #ifdef LIBBSD_OVERLAY
#include_next <getopt.h> #include_next <getopt.h>
#include <unistd.h>
#else #else
#warning "Deprecated header, use <bsd/unistd.h> or <unistd.h> with libbsd-overlay.pc instead."
#include <getopt.h> #include <getopt.h>
#include <bsd/unistd.h>
#endif #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 #endif

10
include/bsd/unistd.h
View File

@ -1,4 +1,5 @@
/* /*
* Copyright © 2006 Robert Millan
* Copyright © 2008-2011 Guillem Jover * Copyright © 2008-2011 Guillem Jover
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -41,6 +42,15 @@
#endif #endif
__BEGIN_DECLS __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); mode_t getmode(const void *set, mode_t mode);
void *setmode(const char *mode_str); void *setmode(const char *mode_str);