From 2396b30d9598bad07fe282e9626779967c4e14b8 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Tue, 23 Jan 2001 16:54:29 +0000 Subject: [PATCH] - (bal) #ifdef around S_IFSOCK if platform does not support it. patch by Tim Rice - (bal) fake-regex.h cleanup based on Tim Rice's patch. --- ChangeLog | 5 ++++- bsd-strmode.c | 2 ++ fake-regex.h | 12 ++++-------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6c364e08f..a89d4464b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,7 +3,10 @@ - markus@cvs.openbsd.org 2001/01/23 10:45:10 [ssh.h] nuke comment - - (bal) no 64bit support patch from Tim Rice + - (bal) no 64bit support patch from Tim Rice + - (bal) #ifdef around S_IFSOCK if platform does not support it. + patch by Tim Rice + - (bal) fake-regex.h cleanup based on Tim Rice's patch. 20010123 - (bal) regexp.h typo in configure.in. Should have been regex.h diff --git a/bsd-strmode.c b/bsd-strmode.c index 2e2d9054e..67e0e4d33 100644 --- a/bsd-strmode.c +++ b/bsd-strmode.c @@ -64,9 +64,11 @@ strmode(mode, p) case S_IFLNK: /* symbolic link */ *p++ = 'l'; break; +#ifdef S_IFSOCK case S_IFSOCK: /* socket */ *p++ = 's'; break; +#endif #ifdef S_IFIFO case S_IFIFO: /* fifo */ *p++ = 'p'; diff --git a/fake-regex.h b/fake-regex.h index 8c4a8f1ca..8f7f6eddd 100644 --- a/fake-regex.h +++ b/fake-regex.h @@ -43,7 +43,6 @@ #ifndef _REGEX_H_ #define _REGEX_H_ -#include #include /* types */ @@ -99,12 +98,9 @@ typedef struct { #define REG_LARGE 01000 /* force large representation */ #define REG_BACKR 02000 /* force use of backref code */ -__BEGIN_DECLS -int regcomp __P((regex_t *, const char *, int)); -size_t regerror __P((int, const regex_t *, char *, size_t)); -int regexec __P((const regex_t *, - const char *, size_t, regmatch_t [], int)); -void regfree __P((regex_t *)); -__END_DECLS +int regcomp(regex_t*, const char*, int); +size_t regerror(int, const regex_t*, char*, size_t); +int regexec(const regex_t*, const char*, size_t, regmatch_t[], int); +void regfree(regex_t*); #endif /* !_REGEX_H_ */