summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--ftparchive/cachedb.cc10
-rw-r--r--ftparchive/cachedb.h4
3 files changed, 10 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 570ad38ed..7700878b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,9 @@ apt (0.5.5) unstable; urgency=low
instead of stdout. Also, errors that occur no longer go to stdout,
but stderr. Closes: #161592
* Test for timegm in configure. Closes: #165516.
+ * s/st_mtime/mtime/ on our local stat structure in apt-ftparchive, to
+ support compliation on platforms where st_mtime is a macro. Closes:
+ #165518
-- Jason Gunthorpe <jgg@debian.org> Sun, 15 Sep 2002 17:16:59 -0600
diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index cbcdfedc6..450a8a47c 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: cachedb.cc,v 1.3 2001/05/29 03:50:33 jgg Exp $
+// $Id: cachedb.cc,v 1.4 2002/11/22 07:19:51 doogie Exp $
/* ######################################################################
CacheDB
@@ -91,16 +91,16 @@ bool CacheDB::SetFile(string FileName,struct stat St,FileFd *Fd)
// Lookup the stat info and confirm the file is unchanged
if (Get() == true)
{
- if (CurStat.st_mtime != htonl(St.st_mtime))
+ if (CurStat.mtime != htonl(St.st_mtime))
{
- CurStat.st_mtime = htonl(St.st_mtime);
+ CurStat.mtime = htonl(St.st_mtime);
CurStat.Flags = 0;
_error->Warning("File date has changed %s",FileName.c_str());
}
}
else
{
- CurStat.st_mtime = htonl(St.st_mtime);
+ CurStat.mtime = htonl(St.st_mtime);
CurStat.Flags = 0;
}
CurStat.Flags = ntohl(CurStat.Flags);
@@ -225,7 +225,7 @@ bool CacheDB::Finish()
{
// Optimize away some writes.
if (CurStat.Flags == OldStat.Flags &&
- CurStat.st_mtime == OldStat.st_mtime)
+ CurStat.mtime == OldStat.st_mtime)
return true;
// Write the stat information
diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index 89b1a2320..257af20fc 100644
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: cachedb.h,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: cachedb.h,v 1.3 2002/11/22 07:19:51 doogie Exp $
/* ######################################################################
CacheDB
@@ -69,7 +69,7 @@ class CacheDB
enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2)};
struct StatStore
{
- uint32_t st_mtime;
+ uint32_t mtime;
uint32_t Flags;
} CurStat;
struct StatStore OldStat;