SCO Open Server 3

[Tim Rice]

CVS (Jan 22 18:41 PST)

Here is a small patch to build on SCO Open Server 3
Patched version of fake-regex.h works.
Added an #ifdef S_IFSOCK to bsd-strmode.c
Added -lintl to *-*-sco3.2v4*) LIBS list for strftime() in sftp-server.c

-- 
Tim Rice				Multitalents	(707) 887-1469
tim at multitalents.net


-------------- next part --------------
--- configure.in.old	Mon Jan 22 18:40:30 2001
+++ configure.in	Mon Jan 22 21:46:58 2001
@@ -211,7 +211,7 @@
 	LDFLAGS="$LDFLAGS -L/usr/local/lib"
 	MANTYPE='$(CATMAN)'
 	mansubdir=cat
-	LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm"
+	LIBS="$LIBS -lgen -lsocket -los -lprot -lx -ltinfo -lm -lintl"
 	no_dev_ptmx=1
 	RANLIB=true
 	AC_DEFINE(BROKEN_SYS_TERMIO_H)
--- bsd-strmode.c.old	Wed Jan 17 18:04:35 2001
+++ bsd-strmode.c	Mon Jan 22 20:11:52 2001
@@ -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';
--- fake-regex.h.old	Fri Jan 19 09:11:43 2001
+++ fake-regex.h	Mon Jan 22 21:26:21 2001
@@ -37,13 +37,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	@(#)regex.h	8.1 (Berkeley) 6/2/93
+ *	@(#)regex.h	8.2 (Berkeley) 1/3/94
  */
 
 #ifndef _REGEX_H_
 #define	_REGEX_H_
 
-#include <sys/cdefs.h>
 #include <sys/types.h>
 
 /* types */
@@ -99,12 +98,14 @@
 #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
-
+#ifdef __cplusplus
+extern "C" {
+#endif
+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*);
+#ifdef __cplusplus
+}
+#endif
 #endif /* !_REGEX_H_ */