diff options
| author | jschauma <jschauma> | 2002-12-28 21:44:00 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2002-12-28 21:44:00 +0000 |
| commit | fbdae1ca6d1bdcc692724c23b842703105e99d0f (patch) | |
| tree | 44d604fc7a4a80305e4d122a4b94b7ff1223aab1 /pkgtools/pkg_install | |
| parent | 3e0dec3560c9af7528e4090ddd9b1347c55f35bd (diff) | |
| download | pkgsrc-fbdae1ca6d1bdcc692724c23b842703105e99d0f.tar.gz | |
Synch with bootstrap-pkgsrc to make this compile on linux.
(Pointed out by Jeremy C. Reed (reed at reedmedia dot net).)
Diffstat (limited to 'pkgtools/pkg_install')
| -rw-r--r-- | pkgtools/pkg_install/files/lib/config.h.in | 2 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/pen.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkg_install/files/lib/config.h.in b/pkgtools/pkg_install/files/lib/config.h.in index 1d52c9fa8b5..f475afe76b0 100644 --- a/pkgtools/pkg_install/files/lib/config.h.in +++ b/pkgtools/pkg_install/files/lib/config.h.in @@ -159,7 +159,7 @@ /* Define if you have the md library (-lmd). */ #undef HAVE_LIBMD -#ifndef HAVE___ATTRIBUTE__ +#if !defined(HAVE___ATTRIBUTE__) && !defined(__linux__) # define __attribute__(x) #endif diff --git a/pkgtools/pkg_install/files/lib/pen.c b/pkgtools/pkg_install/files/lib/pen.c index 7373f5a1df6..9d8f3e64d12 100644 --- a/pkgtools/pkg_install/files/lib/pen.c +++ b/pkgtools/pkg_install/files/lib/pen.c @@ -1,4 +1,4 @@ -/* $NetBSD: pen.c,v 1.1.1.1 2002/12/20 18:14:03 schmonz Exp $ */ +/* $NetBSD: pen.c,v 1.2 2002/12/28 21:44:00 jschauma Exp $ */ #if 0 #include <sys/cdefs.h> @@ -6,7 +6,7 @@ #if 0 static const char *rcsid = "from FreeBSD Id: pen.c,v 1.25 1997/10/08 07:48:12 charnier Exp"; #else -__RCSID("$NetBSD: pen.c,v 1.1.1.1 2002/12/20 18:14:03 schmonz Exp $"); +__RCSID("$NetBSD: pen.c,v 1.2 2002/12/28 21:44:00 jschauma Exp $"); #endif #endif #endif @@ -227,8 +227,8 @@ leave_playpen(char *save) * We do this autoconf dance here to get around the old interface (it's * in libc on 2.7 and 2.8, but not in 2.9) */ -#if !defined(HAVE_STATFS) || (defined(HAVE_STATFS) && defined(HAVE_STATVFS)) -/* $NetBSD: pen.c,v 1.1.1.1 2002/12/20 18:14:03 schmonz Exp $ */ +#if !defined(HAVE_STATFS) || (defined(HAVE_STATFS) && defined(HAVE_STATVFS) && !defined(__linux__)) +/* $NetBSD: pen.c,v 1.2 2002/12/28 21:44:00 jschauma Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. |