RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Ralf S. Engelschall Root: /v/rpm/cvs Email: [EMAIL PROTECTED] Module: rpm Date: 21-Jun-2007 13:24:11 Branch: HEAD Handle: 2007062112241000 Modified files: rpm/lib fs.c rpm/rpmio rpmdav.c rpmdav.h Log: fix building under NetBSD 3.1 Summary: Revision Changes Path 2.51 +4 -0 rpm/lib/fs.c 2.36 +2 -2 rpm/rpmio/rpmdav.c 2.14 +1 -1 rpm/rpmio/rpmdav.h ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/lib/fs.c ============================================================================ $ cvs diff -u -r2.50 -r2.51 fs.c --- rpm/lib/fs.c 18 Jun 2007 17:31:23 -0000 2.50 +++ rpm/lib/fs.c 21 Jun 2007 11:24:10 -0000 2.51 @@ -170,7 +170,11 @@ getmntinfo_r(&mounts, flags, &mntCount, &bufSize); # elif HAVE_GETMNTINFO /* This is Mac OS X */ +#if defined(__NetBSD__) + struct statvfs * mounts = NULL; +#else struct statfs * mounts = NULL; +#endif int mntCount = 0, flags = MNT_NOWAIT; int nextMount = 0; @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmdav.c ============================================================================ $ cvs diff -u -r2.35 -r2.36 rpmdav.c --- rpm/rpmio/rpmdav.c 17 Jun 2007 14:49:02 -0000 2.35 +++ rpm/rpmio/rpmdav.c 21 Jun 2007 11:24:10 -0000 2.36 @@ -1544,7 +1544,7 @@ dp->d_reclen = 0; /* W2DO? */ #if !(defined(hpux) || defined(__hpux) || defined(sun)) -#if !defined(__APPLE__) && !defined(__FreeBSD_kernel__) && !defined(__FreeBSD__) +#if !defined(__APPLE__) && !defined(__FreeBSD_kernel__) && !defined(__FreeBSD__) && !defined(__NetBSD__) dp->d_off = 0; /* W2DO? */ #endif /[EMAIL PROTECTED]@*/ @@ -1668,7 +1668,7 @@ dp->d_reclen = 0; /* W2DO? */ #if !(defined(hpux) || defined(__hpux) || defined(sun)) -#if !defined(__APPLE__) && !defined(__FreeBSD_kernel__) && !defined(__FreeBSD__) +#if !defined(__APPLE__) && !defined(__FreeBSD_kernel__) && !defined(__FreeBSD__) && !defined(__NetBSD__) dp->d_off = 0; /* W2DO? */ #endif /[EMAIL PROTECTED]@*/ @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/rpmdav.h ============================================================================ $ cvs diff -u -r2.13 -r2.14 rpmdav.h --- rpm/rpmio/rpmdav.h 15 Jun 2007 14:27:52 -0000 2.13 +++ rpm/rpmio/rpmdav.h 21 Jun 2007 11:24:10 -0000 2.14 @@ -30,7 +30,7 @@ typedef struct __dirstream * AVDIR; typedef struct __dirstream * DAVDIR; #else -# if defined(__FreeBSD__) +# if defined(__FreeBSD__) || defined(__NetBSD__) typedef struct __dirstream * AVDIR; typedef struct __dirstream * DAVDIR; #else /* __FreeBSD__ */ @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org