diff options
author | Tim Rice <tim@multitalents.net> | 2001-09-17 14:34:33 -0700 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2001-09-17 14:34:33 -0700 |
commit | a4f7ae1a35b5da61705bea75bcc50bc7a27726dd (patch) | |
tree | 366ca694b41098a5808d5e584244241dacba921a /openbsd-compat | |
parent | c3bd7eccac2c9d087dd23ab4929d423414d3f18e (diff) |
- (tim) [includes.h openbsd-compat/getopt.c openbsd-compat/getopt.h]
rename getopt() to BSDgetopt() to keep form conflicting with
system getopt().
[Makefile.in configure.in] disable filepriv until I can add
missing procpriv calls.
Diffstat (limited to 'openbsd-compat')
-rw-r--r-- | openbsd-compat/getopt.c | 2 | ||||
-rw-r--r-- | openbsd-compat/getopt.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/openbsd-compat/getopt.c b/openbsd-compat/getopt.c index 071e27885..9e13504a0 100644 --- a/openbsd-compat/getopt.c +++ b/openbsd-compat/getopt.c | |||
@@ -57,7 +57,7 @@ char *optarg; /* argument associated with option */ | |||
57 | * Parse argc/argv argument vector. | 57 | * Parse argc/argv argument vector. |
58 | */ | 58 | */ |
59 | int | 59 | int |
60 | getopt(nargc, nargv, ostr) | 60 | BSDgetopt(nargc, nargv, ostr) |
61 | int nargc; | 61 | int nargc; |
62 | char * const *nargv; | 62 | char * const *nargv; |
63 | const char *ostr; | 63 | const char *ostr; |
diff --git a/openbsd-compat/getopt.h b/openbsd-compat/getopt.h index d981fe434..08a4eb3e0 100644 --- a/openbsd-compat/getopt.h +++ b/openbsd-compat/getopt.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: getopt.h,v 1.2 2001/07/14 16:05:55 stevesk Exp $ */ | 1 | /* $Id: getopt.h,v 1.3 2001/09/17 21:34:34 tim Exp $ */ |
2 | 2 | ||
3 | #ifndef _GETOPT_H | 3 | #ifndef _GETOPT_H |
4 | #define _GETOPT_H | 4 | #define _GETOPT_H |
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | #ifndef HAVE_GETOPT_H | 8 | #ifndef HAVE_GETOPT_H |
9 | 9 | ||
10 | int getopt(int argc, char * const *argv, const char *opts); | 10 | int BSDgetopt(int argc, char * const *argv, const char *opts); |
11 | 11 | ||
12 | #endif | 12 | #endif |
13 | 13 | ||