Date: Thu, 17 Jun 2010 23:37:11 GMT From: Benjamin Fiedler <bfiedler@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 179741 for review Message-ID: <201006172337.o5HNbBgf006773@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@179741?ac=10 Change 179741 by bfiedler@freebsd-7803 on 2010/06/17 23:36:28 Sdiff now compiles on FreeBSD (w/ warnings), but depends on external headers in /usr/src Affected files ... .. //depot/projects/soc2010/bsdtextproc/sdiff/Makefile#2 edit .. //depot/projects/soc2010/bsdtextproc/sdiff/common.h#2 edit .. //depot/projects/soc2010/bsdtextproc/sdiff/sdiff.c#2 edit Differences ... ==== //depot/projects/soc2010/bsdtextproc/sdiff/Makefile#2 (text+ko) ==== @@ -1,5 +1,16 @@ # $OpenBSD: Makefile,v 1.4 2006/02/20 08:38:18 otto Exp $ + +#.if defined(__FreeBSD__) + +INCLUDEDIR+=/usr/src/crypto/openssh/openbsd-compat /usr/src/contrib/traceroute/lbl + +.for dir in ${INCLUDEDIR} + CFLAGS+= -I${dir} +.endfor + +#.endif + PROG=sdiff SRCS=common.c edit.c sdiff.c COPTS+=-Wall -W @@ -7,4 +18,6 @@ LDADD+= -lutil DPADD+= ${LIBUTIL} + + .include <bsd.prog.mk> ==== //depot/projects/soc2010/bsdtextproc/sdiff/common.h#2 (text+ko) ==== @@ -5,4 +5,8 @@ * Public domain. */ +#ifdef __FreeBSD__ +#include "gnuc.h" +#endif + __dead void cleanup(const char *); ==== //depot/projects/soc2010/bsdtextproc/sdiff/sdiff.c#2 (text+ko) ==== @@ -22,7 +22,14 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> -#include <util.h> + +#ifdef __FreeBSD__ + #include <sys-queue.h> + #include <stdint.h> + #include <libutil.h> +#else + #include <util.h> +#endif #include "common.h" #include "extern.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006172337.o5HNbBgf006773>