--- a/lib-src/fakemail.c	Mon Aug 13 11:33:40 2007 +0200
+++ b/lib-src/fakemail.c	Mon Aug 13 11:35:02 2007 +0200
@@ -46,14 +46,6 @@
   return 1;
 }
 #else /* not BSD 4.2 (or newer) */
-#ifdef MSDOS
-int
-main (int argc, char *argv[])
-{
-  return 0;
-}
-#else /* not MSDOS */
-/* This conditional contains all the rest of the file.  */
 
 /* These are defined in config in some versions. */
 
@@ -144,7 +136,7 @@
 #define MAIL_PROGRAM_NAME "/bin/mail"
 #endif
 
-static CONST char *my_name;
+static const char *my_name;
 static char *the_date;
 static char *the_user;
 static line_list file_preface;
@@ -171,7 +163,7 @@
 /* Print error message.  `s1' is printf control string, `s2' is arg for it. */
 
 static void
-error (CONST char *s1, CONST char *s2)
+error (const char *s1, const char *s2)
 {
   printf ("%s: ", my_name);
   printf (s1, s2);
@@ -182,7 +174,7 @@
 /* Print error message and exit.  */
 
 static void
-fatal (CONST char *s1, CONST char *s2)
+fatal (const char *s1, const char *s2)
 {
   error (s1, s2);
   exit (1);
@@ -310,7 +302,7 @@
 make_file_preface (void)
 {
   char *the_string, *temp;
-  long idiotic_interface;
+  time_t idiotic_interface;
   long prefix_length;
   long user_length;
   long date_length;
@@ -321,8 +313,9 @@
   the_date = ctime (&idiotic_interface);
   /* the_date has an unwanted newline at the end */
   date_length = strlen (the_date) - 1;
-  the_date[date_length] = '\0';
-#ifdef WINDOWSNT
+  if (the_date[date_length] == '\n')
+    the_date[date_length] = '\0';
+#ifdef WIN32_NATIVE
   temp = "(null)";
 #else
   temp = cuserid ((char *) NULL);
@@ -419,20 +412,20 @@
 }
 
 static void
-put_line (CONST char *string)
+put_line (const char *string)
 {
   register stream_list rem;
   for (rem = the_streams;
        rem != ((stream_list) NULL);
        rem = rem->rest_streams)
     {
-      CONST char *s = string;
+      const char *s = string;
       int column = 0;
 
       /* Divide STRING into lines.  */
       while (*s != 0)
 	{
-	  CONST char *breakpos;
+	  const char *breakpos;
 
 	  /* Find the last char that fits.  */
 	  for (breakpos = s; *breakpos && column < 78; ++breakpos)
@@ -673,5 +666,4 @@
   return close_the_streams ();
 }
 
-#endif /* not MSDOS */
 #endif /* not BSD 4.2 (or newer) */