summaryrefslogtreecommitdiffstats
path: root/openbsd-compat
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2001-09-17 23:34:33 +0200
committerTim Rice <tim@multitalents.net>2001-09-17 23:34:33 +0200
commita4f7ae1a35b5da61705bea75bcc50bc7a27726dd (patch)
tree366ca694b41098a5808d5e584244241dacba921a /openbsd-compat
parentdouble doh (diff)
downloadopenssh-a4f7ae1a35b5da61705bea75bcc50bc7a27726dd.tar.xz
openssh-a4f7ae1a35b5da61705bea75bcc50bc7a27726dd.zip
- (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.c2
-rw-r--r--openbsd-compat/getopt.h4
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 */
* Parse argc/argv argument vector.
*/
int
-getopt(nargc, nargv, ostr)
+BSDgetopt(nargc, nargv, ostr)
int nargc;
char * const *nargv;
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 @@
-/* $Id: getopt.h,v 1.2 2001/07/14 16:05:55 stevesk Exp $ */
+/* $Id: getopt.h,v 1.3 2001/09/17 21:34:34 tim Exp $ */
#ifndef _GETOPT_H
#define _GETOPT_H
@@ -7,7 +7,7 @@
#ifndef HAVE_GETOPT_H
-int getopt(int argc, char * const *argv, const char *opts);
+int BSDgetopt(int argc, char * const *argv, const char *opts);
#endif