From a91f5ee6185fa2e77a17d0e72f8ada94f57e3409 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Wed, 16 Feb 2005 14:20:06 +1100
Subject:  - (dtucker) [auth-shadow.c] Prevent compiler warnings if "DAY" is
 defined    by the system headers.

---
 ChangeLog     | 4 +++-
 auth-shadow.c | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2716b7de6..17491a41a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    ok dtucker@
  - (dtucker) [ssh-rand-helper.c] Provide seed_rng since it may be called
    via mkstemp in some configurations.  ok djm@
+ - (dtucker) [auth-shadow.c] Prevent compiler warnings if "DAY" is defined
+   by the system headers.
 
 20050215
  - (dtucker) [config.sh.in] Collect oslevel -r too.
@@ -2137,4 +2139,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3655 2005/02/16 02:20:07 dtucker Exp $
+$Id: ChangeLog,v 1.3656 2005/02/16 03:20:06 dtucker Exp $
diff --git a/auth-shadow.c b/auth-shadow.c
index a85442d72..f6004f68f 100644
--- a/auth-shadow.c
+++ b/auth-shadow.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$Id: auth-shadow.c,v 1.5 2004/02/21 23:22:05 dtucker Exp $");
+RCSID("$Id: auth-shadow.c,v 1.6 2005/02/16 03:20:06 dtucker Exp $");
 
 #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
 #include <shadow.h>
@@ -32,6 +32,9 @@ RCSID("$Id: auth-shadow.c,v 1.5 2004/02/21 23:22:05 dtucker Exp $");
 #include "buffer.h"
 #include "log.h"
 
+#ifdef DAY
+# undef DAY
+#endif
 #define DAY	(24L * 60 * 60) /* 1 day in seconds */
 
 extern Buffer loginmsg;
-- 
cgit v1.2.3