From: mdw <mdw>
Date: Sun, 10 Oct 1999 16:53:53 +0000 (+0000)
Subject: Merge in differences from the resolver's version.
X-Git-Tag: 1.2.6~2
X-Git-Url: https://git.distorted.org.uk/~mdw/cfd/commitdiff_plain/df66cb0f07679316773e28860adcf62fa42cae30

Merge in differences from the resolver's version.
---

diff --git a/getdate.y b/getdate.y
index 4be26bf..c1818de 100644
--- a/getdate.y
+++ b/getdate.y
@@ -836,6 +836,8 @@ yylex ()
 
 #define TM_YEAR_ORIGIN 1900
 
+#ifndef GETDATE_IGNORE_TIMEZONE
+
 /* Yield A - B, measured in seconds.  */
 static long
 difftm (a, b)
@@ -858,6 +860,8 @@ difftm (a, b)
 	  + (a->tm_sec - b->tm_sec));
 }
 
+#endif
+
 time_t
 get_date (p, now)
      const char *p;
@@ -927,6 +931,7 @@ get_date (p, now)
          zone by 24 hours to compensate.  This algorithm assumes that
          there is no DST transition within a day of the time_t boundaries.  */
 
+#ifndef GETDATE_IGNORE_TIMEZONE
       if (yyHaveZone)
 	{
 	  tm = tm0;
@@ -942,6 +947,7 @@ get_date (p, now)
 	    }
 	  Start = mktime (&tm);
 	}
+#endif
 
       if (Start == (time_t) -1)
 	return Start;
@@ -956,6 +962,7 @@ get_date (p, now)
 	return Start;
     }
 
+#ifndef GETDATE_IGNORE_TIMEZONE
   if (yyHaveZone)
     {
       long delta = yyTimezone * 60L + difftm (&tm, gmtime (&Start));
@@ -963,6 +970,7 @@ get_date (p, now)
 	return -1;		/* time_t overflow */
       Start += delta;
     }
+#endif
 
   return Start;
 }