diff options
| author | Damien Miller <djm@mindrot.org> | 2006-07-24 14:55:47 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2006-07-24 14:55:47 +1000 |
| commit | 8b373baf13f9bec712ad01a0242241bc6529f5f4 (patch) | |
| tree | 1cfb8bdabfc7783ee3cfd9a1e43a6fe75fd18148 | |
| parent | b8fe89c4d97ea9a5d7efb2c60108b8a7644f6a49 (diff) | |
| download | openssh-git-8b373baf13f9bec712ad01a0242241bc6529f5f4.tar.gz | |
- (djm) [openbsd-compat/glob.c]
Move get_arg_max() into the ifdef HAVE_GLOB block so that it compiles
on OpenBSD (or other platforms with a decent glob implementation) with
-Werror
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | openbsd-compat/glob.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -112,6 +112,10 @@ make the portable tree compile again - sprinkle unistd.h and string.h back in. Don't redefine __unused, as it turned out to be used in headers on Linux, and replace its use in auth-pam.c with ARGSUSED + - (djm) [openbsd-compat/glob.c] + Move get_arg_max() into the ifdef HAVE_GLOB block so that it compiles + on OpenBSD (or other platforms with a decent glob implementation) with + -Werror 20060713 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h @@ -5030,4 +5034,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4430 2006/07/24 04:51:00 djm Exp $ +$Id: ChangeLog,v 1.4431 2006/07/24 04:55:47 djm Exp $ diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index b4873932..90723535 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c @@ -44,6 +44,9 @@ #include <string.h> #include <unistd.h> +#if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \ + !defined(GLOB_HAS_GL_MATCHC) + static long get_arg_max(void) { @@ -56,9 +59,6 @@ get_arg_max(void) #endif } -#if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \ - !defined(GLOB_HAS_GL_MATCHC) - /* * glob(3) -- a superset of the one defined in POSIX 1003.2. * |