diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | posix/regex.c | 7 | ||||
| -rw-r--r-- | sysdeps/mach/hurd/pathconf.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index b3a9495ee7..598f70f21e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ Tue Jul 25 09:14:53 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> + * sysdeps/mach/hurd/pathconf.c: Declare VALUE as int, not long int. + * stdlib/strtol.c [_LIBC]: Define STDC_HEADERS. * sysdeps/unix/sysv/ftime.S: New file. diff --git a/posix/regex.c b/posix/regex.c index 6f89d96a3f..5faba4b4ed 100644 --- a/posix/regex.c +++ b/posix/regex.c @@ -264,7 +264,8 @@ char *alloca (); /* Define how to allocate the failure stack. */ -#ifdef REL_ALLOC +#if defined (REL_ALLOC) && defined (REGEX_MALLOC) + #define REGEX_ALLOCATE_STACK(size) \ r_alloc (&failure_stack_ptr, (size)) #define REGEX_REALLOCATE_STACK(source, osize, nsize) \ @@ -272,7 +273,7 @@ char *alloca (); #define REGEX_FREE_STACK(ptr) \ r_alloc_free (&failure_stack_ptr) -#else /* not REL_ALLOC */ +#else /* not using relocating allocator */ #ifdef REGEX_MALLOC @@ -290,7 +291,7 @@ char *alloca (); #define REGEX_FREE_STACK(arg) #endif /* not REGEX_MALLOC */ -#endif /* not REL_ALLOC */ +#endif /* not using relocating allocator */ /* True if `size1' is non-NULL and PTR is pointing anywhere inside diff --git a/sysdeps/mach/hurd/pathconf.c b/sysdeps/mach/hurd/pathconf.c index 315ab1f97e..f7923ae967 100644 --- a/sysdeps/mach/hurd/pathconf.c +++ b/sysdeps/mach/hurd/pathconf.c @@ -27,8 +27,8 @@ long int __pathconf (const char *file, int name) { error_t err; + int value; /* RPC returns an `int', not a `long int'. */ file_t port = __file_name_lookup (file, 0, 0); - long int value; if (port == MACH_PORT_NULL) return -1L; err = __file_pathconf (port, name, &value); |