--- a/src/strftime.c	Mon Aug 13 11:33:40 2007 +0200
+++ b/src/strftime.c	Mon Aug 13 11:35:02 2007 +0200
@@ -94,13 +94,13 @@
 time_t mktime ();
 #endif
 
-#if defined(WINDOWSNT) || defined(__CYGWIN32__)
+#if defined(WIN32_NATIVE) || defined(CYGWIN)
 #include <time.h>
 #else
 #if defined(HAVE_TZNAME)
 extern char *tzname[2];
 #endif
-#endif /* WINDOWSNT */
+#endif /* WIN32_NATIVE */
 
 #ifdef emacs
 #define strftime emacs_strftime
@@ -112,12 +112,12 @@
   none, blank, zero
 };
 
-static char CONST* CONST days[] =
+static char const* const days[] =
 {
   "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
 };
 
-static char CONST * CONST months[] =
+static char const * const months[] =
 {
   "January", "February", "March", "April", "May", "June",
   "July", "August", "September", "October", "November", "December"
@@ -174,7 +174,7 @@
 /* Like strncpy except return the number of characters copied. */
 
 static int
-add_str (char *to, CONST char *from, int max)
+add_str (char *to, const char *from, int max)
 {
   int i;
 
@@ -203,7 +203,7 @@
    starting on Sundays. */
 
 static int
-sun_week (CONST struct tm *tm)
+sun_week (const struct tm *tm)
 {
   int dl;
 
@@ -220,7 +220,7 @@
    starting on Mondays. */
 
 static int
-mon_week (CONST struct tm *tm)
+mon_week (const struct tm *tm)
 {
   int dl, wday;
 
@@ -233,8 +233,9 @@
 }
 
 #if !defined(HAVE_TM_ZONE) && !defined(HAVE_TZNAME)
+char *zone_name (const struct tm *tp);
 char *
-zone_name (CONST struct tm *tp)
+zone_name (const struct tm *tp)
 {
   char *timezone ();
   struct timeval tv;
@@ -251,11 +252,11 @@
    that were put into STRING, or 0 if the length would have
    exceeded MAX. */
 
-size_t strftime (char *string, size_t max, CONST char *format,
-		 CONST struct tm *tm);
+size_t strftime (char *string, size_t max, const char *format,
+		 const struct tm *tm);
 
 size_t
-strftime (char *string, size_t max, CONST char *format, CONST struct tm *tm)
+strftime (char *string, size_t max, const char *format, const struct tm *tm)
 {
   enum padding pad;		/* Type of padding to apply. */
   size_t length = 0;		/* Characters put in STRING so far. */