diff options
author | alfred <alfred@FreeBSD.org> | 2004-09-08 08:44:14 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2004-09-08 08:44:14 +0000 |
commit | 8337118014694f7f25c0fe0425553914b6ae882a (patch) | |
tree | 24bbe73be77f1a04bbf9f3e5aa2f938fb71bbf35 /lib/libautofs | |
parent | c2b417e394a6ab4f6a2101136afaf4b8e57fdfef (diff) | |
download | FreeBSD-src-8337118014694f7f25c0fe0425553914b6ae882a.zip FreeBSD-src-8337118014694f7f25c0fe0425553914b6ae882a.tar.gz |
sync with private code:
fix a 5.x'ism that 4.x needs protection from.
make this code compile standalone.
Diffstat (limited to 'lib/libautofs')
-rw-r--r-- | lib/libautofs/Makefile | 2 | ||||
-rw-r--r-- | lib/libautofs/libautofs.3 | 2 | ||||
-rw-r--r-- | lib/libautofs/libautofs.c | 6 | ||||
-rw-r--r-- | lib/libautofs/libautofs.h | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/lib/libautofs/Makefile b/lib/libautofs/Makefile index 7b69c96..744bc63 100644 --- a/lib/libautofs/Makefile +++ b/lib/libautofs/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 2004/08/31 16:26:24 bright Exp $ +# $Id: Makefile,v 1.5 2004/09/08 08:12:21 bright Exp $ # $FreeBSD$ LIB= autofs diff --git a/lib/libautofs/libautofs.3 b/lib/libautofs/libautofs.3 index 2875c06..0c92af2 100644 --- a/lib/libautofs/libautofs.3 +++ b/lib/libautofs/libautofs.3 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $Id: libautofs.3,v 1.3 2004/08/31 15:58:40 bright Exp $ +.\" $Id: libautofs.3,v 1.4 2004/09/08 08:12:21 bright Exp $ .\" $FreeBSD$ .Dd August 30, 2004 .Dt LIBAUTOFS 3 diff --git a/lib/libautofs/libautofs.c b/lib/libautofs/libautofs.c index 7d2e26a..88bad16 100644 --- a/lib/libautofs/libautofs.c +++ b/lib/libautofs/libautofs.c @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD$ - * $Id: libautofs.c,v 1.3 2004/08/31 08:49:56 bright Exp $ + * $Id: libautofs.c,v 1.5 2004/09/08 08:44:12 bright Exp $ */ #include <err.h> #include <ctype.h> @@ -43,7 +43,11 @@ #include <sys/stat.h> #include <sys/sysctl.h> +#ifdef AUTOFSSTANDALONE +#include "../autofs/autofs.h" +#else #include <fs/autofs/autofs.h> +#endif #include "libautofs.h" diff --git a/lib/libautofs/libautofs.h b/lib/libautofs/libautofs.h index 98da2f8..5fb29a9 100644 --- a/lib/libautofs/libautofs.h +++ b/lib/libautofs/libautofs.h @@ -24,7 +24,7 @@ * SUCH DAMAGE. * * $FreeBSD$ - * $Id: libautofs.h,v 1.3 2004/08/31 08:49:56 bright Exp $ + * $Id: libautofs.h,v 1.4 2004/09/08 08:12:21 bright Exp $ */ #ifndef _LIBAUTOFS_H #define _LIBAUTOFS_H |