diff options
| author | Roland McGrath <roland@redhat.com> | 1996-06-22 21:14:22 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@redhat.com> | 1996-06-22 21:14:22 +0000 |
| commit | 63f3cf925bcaa8ea3bcfa63800bc52d581c40bcc (patch) | |
| tree | a3933ec37b3fc590c7f276f9fd7205f80cbe7191 /glob/glob.c | |
| parent | 8541e3345df12b3c4941c8b7261b966e073cc461 (diff) | |
| download | gunmake-63f3cf925bcaa8ea3bcfa63800bc52d581c40bcc.tar.gz | |
Updated from libc
Diffstat (limited to 'glob/glob.c')
| -rw-r--r-- | glob/glob.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/glob/glob.c b/glob/glob.c index 7dfd7f5..d6635fc 100644 --- a/glob/glob.c +++ b/glob/glob.c @@ -65,7 +65,7 @@ Cambridge, MA 02139, USA. */ #endif #endif -#ifndef _AMIGA +#if !defined (_AMIGA) && !defined (VMS) #include <pwd.h> #endif @@ -93,6 +93,9 @@ extern int errno; # ifdef HAVE_NDIR_H # include <ndir.h> # endif +# ifdef HAVE_VMSDIR_H +# include "vmsdir.h" +# endif /* HAVE_VMSDIR_H */ #endif @@ -185,9 +188,9 @@ my_realloc (p, n) #undef alloca #define alloca(n) __builtin_alloca (n) #else /* Not GCC. */ -#if defined (sparc) || defined (HAVE_ALLOCA_H) +#ifdef HAVE_ALLOCA_H #include <alloca.h> -#else /* Not sparc or HAVE_ALLOCA_H. */ +#else /* Not HAVE_ALLOCA_H. */ #ifndef _AIX extern char *alloca (); #endif /* Not _AIX. */ @@ -435,6 +438,7 @@ glob (pattern, flags, errfunc, pglob) oldcount = pglob->gl_pathc; +#ifndef VMS if ((flags & GLOB_TILDE) && dirname[0] == '~') { if (dirname[1] == '\0') @@ -473,6 +477,7 @@ glob (pattern, flags, errfunc, pglob) #endif } } +#endif /* Not VMS. */ if (glob_pattern_p (dirname, !(flags & GLOB_NOESCAPE))) { |