- (bal) #ifdef around S_IFSOCK if platform does not support it.
patch by Tim Rice <tim@multitalents.net>
- (bal) fake-regex.h cleanup based on Tim Rice's patch.
diff --git a/ChangeLog b/ChangeLog
index 6c364e0..a89d446 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 <tim@multitalents.net>
+ - (bal) no 64bit support patch from Tim Rice <tim@multitalents.net>
+ - (bal) #ifdef around S_IFSOCK if platform does not support it.
+ patch by Tim Rice <tim@multitalents.net>
+ - (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 2e2d905..67e0e4d 100644
--- a/bsd-strmode.c
+++ b/bsd-strmode.c
@@ -64,9 +64,11 @@
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 8c4a8f1..8f7f6ed 100644
--- a/fake-regex.h
+++ b/fake-regex.h
@@ -43,7 +43,6 @@
#ifndef _REGEX_H_
#define _REGEX_H_
-#include <sys/cdefs.h>
#include <sys/types.h>
/* types */
@@ -99,12 +98,9 @@
#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_ */