X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetdate.y;h=c698584ebf3100dcf7f8eefc995e3f4c0e232e31;hb=98a354147cdb6d15365600fac33d492d7387996f;hp=b95f5641cfdc06978996142f90687bf46a50fda7;hpb=00869359a2929975ef1b6646a8818f56bfb08afe;p=gnulib.git

diff --git a/lib/getdate.y b/lib/getdate.y
index b95f5641c..c698584eb 100644
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -73,7 +73,7 @@
 # include <string.h>
 #endif
 
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8) || __STRICT_ANSI__
 # define __attribute__(x)
 #endif
 
@@ -503,7 +503,7 @@ static table const relative_time_table[] =
   { "TODAY",	tMINUTE_UNIT,	 0 },
   { "NOW",	tMINUTE_UNIT,	 0 },
   { "LAST",	tUNUMBER,	-1 },
-  { "THIS",	tMINUTE_UNIT,	 0 },
+  { "THIS",	tUNUMBER,	 0 },
   { "NEXT",	tUNUMBER,	 1 },
   { "FIRST",	tUNUMBER,	 1 },
 /*{ "SECOND",	tUNUMBER,	 2 }, */
@@ -880,14 +880,14 @@ get_date (const char *p, const time_t *now)
     for (quarter = 1; quarter <= 3; quarter++)
       {
 	time_t probe = Start + quarter * (90 * 24 * 60 * 60);
-	struct tm *tm = localtime (&probe);
-	if (tm && tm->tm_zone
-	    && tm->tm_isdst != pc.local_time_zone_table[0].value)
+	struct tm *probe_tm = localtime (&probe);
+	if (probe_tm && probe_tm->tm_zone
+	    && probe_tm->tm_isdst != pc.local_time_zone_table[0].value)
 	  {
 	      {
-		pc.local_time_zone_table[1].name = tm->tm_zone;
+		pc.local_time_zone_table[1].name = probe_tm->tm_zone;
 		pc.local_time_zone_table[1].type = tLOCAL_ZONE;
-		pc.local_time_zone_table[1].value = tm->tm_isdst;
+		pc.local_time_zone_table[1].value = probe_tm->tm_isdst;
 		pc.local_time_zone_table[2].name = 0;
 	      }
 	    break;