import -ko -b 1.1.3 XEmacs XEmacs-21_2 r21-2-35

[chise/xemacs-chise.git.1] / src / strftime.c

diff --git a/src/strftime.c b/src/strftime.c
index 3876617..926806d 100644 (file)
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -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
@@ -233,6 +233,7 @@ mon_week (const struct tm *tm)
 }
 
 #if !defined(HAVE_TM_ZONE) && !defined(HAVE_TZNAME)
+char *zone_name (const struct tm *tp);
 char *
 zone_name (const struct tm *tp)
 {