--- a/lib-src/make-docfile.c	Mon Aug 13 11:33:40 2007 +0200
+++ b/lib-src/make-docfile.c	Mon Aug 13 11:35:02 2007 +0200
@@ -46,40 +46,38 @@
 #include <errno.h>
 #if __STDC__ || defined(STDC_HEADERS)
 #include <stdlib.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <string.h>
 #include <ctype.h>
 #endif
 
-#if defined(MSDOS) || defined(__CYGWIN32__)
+#ifdef CYGWIN
 #include <fcntl.h>
-#endif /* MSDOS */
-#ifdef WINDOWSNT
+#endif
+#ifdef WIN32_NATIVE
 #include <direct.h>
 #include <fcntl.h>
 #include <io.h>
 #include <stdlib.h>
-#endif /* WINDOWSNT */
+#endif /* WIN32_NATIVE */
 
+#ifndef WIN32_NATIVE
 #include <sys/param.h>
+#endif /* not WIN32_NATIVE */
 
-#if defined(DOS_NT) || defined(__CYGWIN32__)
+#if defined(WIN32_NATIVE) || defined(CYGWIN)
 #define READ_TEXT "rt"
 #define READ_BINARY "rb"
 #define WRITE_BINARY "wb"
 #define APPEND_BINARY "ab"
-#else  /* not DOS_NT */
+#else  /* not WIN32_NATIVE */
 #define READ_TEXT "r"
 #define READ_BINARY "r"
 #define WRITE_BINARY "w"
 #define APPEND_BINARY "a"
-#endif /* not DOS_NT */
-
-#ifdef MSDOS
-/* s/msdos.h defines this as sys_chdir, but we're not linking with the
-   file where that function is defined.  */
-#undef chdir
-#endif
+#endif /* not WIN32_NATIVE */
 
 /* Stdio stream for output to the DOC file.  */
 static FILE *outfile;
@@ -91,14 +89,14 @@
   c_file
 } Current_file_type;
 
-static int scan_file (CONST char *filename);
+static int scan_file (const char *filename);
 static int read_c_string (FILE *, int, int);
-static void write_c_args (FILE *out, CONST char *func, char *buf, int minargs,
+static void write_c_args (FILE *out, const char *func, char *buf, int minargs,
 			  int maxargs);
-static int scan_c_file (CONST char *filename, CONST char *mode);
+static int scan_c_file (const char *filename, const char *mode);
 static void skip_white (FILE *);
 static void read_lisp_symbol (FILE *, char *);
-static int scan_lisp_file (CONST char *filename, CONST char *mode);
+static int scan_lisp_file (const char *filename, const char *mode);
 
 #define C_IDENTIFIER_CHAR_P(c) \
  (('A' <= c && c <= 'Z') || \
@@ -115,7 +113,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)
 {
   fprintf (stderr, "%s: ", progname);
   fprintf (stderr, s1, s2);
@@ -125,7 +123,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);
@@ -191,19 +189,10 @@
   outfile = stdout;
 
   /* Don't put CRs in the DOC file.  */
-#ifdef MSDOS
-  _fmode = O_BINARY;
-#if 0  /* Suspicion is that this causes hanging.
-	  So instead we require people to use -o on MSDOS.  */
-  (stdout)->_flag &= ~_IOTEXT;
-  _setmode (fileno (stdout), O_BINARY);
-#endif
-  outfile = 0;
-#endif /* MSDOS */
-#ifdef WINDOWSNT
+#ifdef WIN32_NATIVE
   _fmode = O_BINARY;
   _setmode (fileno (stdout), O_BINARY);
-#endif /* WINDOWSNT */
+#endif /* WIN32_NATIVE */
 
   /* If first two args are -o FILE, output to FILE.  */
   i = 1;
@@ -274,7 +263,7 @@
 /* Return 1 if file is not found, 0 if it is found.  */
 
 static int
-scan_file (CONST char *filename)
+scan_file (const char *filename)
 {
   int len = strlen (filename);
   if (ellcc == 0 && len > 4 && !strcmp (filename + len - 4, ".elc"))
@@ -303,48 +292,59 @@
  Convert escape sequences \n and \t to newline and tab;
  discard \ followed by newline.  */
 
+#define MDGET do { prevc = c; c = getc (infile); } while (0)
 static int
 read_c_string (FILE *infile, int printflag, int c_docstring)
 {
-  register int c;
+  register int prevc = 0, c = 0;
   char *p = buf;
   int start = -1;
 
-  c = getc (infile);
+  MDGET;
   while (c != EOF)
     {
       while ((c_docstring || c != '"') && c != EOF)
 	{
-	  if (start)
+	  if (c == '*')
 	    {
-	      if (c == '*')
+	      int cc = getc (infile);
+	      if (cc == '/')
 		{
-		  int cc = getc (infile);
-		  if (cc == '/')
-		    break;
-		  else
-		    ungetc (cc, infile);
+		  if (prevc != '\n')
+		    {
+		      if (printflag > 0)
+			{
+			  if (ellcc)
+			    fprintf (outfile, "\\n\\");
+			  putc ('\n', outfile);
+			}
+		      else if (printflag < 0)
+			*p++ = '\n';
+		    }
+		  break;
 		}
+	      else
+		ungetc (cc, infile);
+	    }
 
-	      if (start != -1)
+	  if (start == 1)
+	    {
+	      if (printflag > 0)
 		{
-		  if (printflag > 0)
-            {
-              if (ellcc)
-                fprintf (outfile, "\\n\\");
-              putc ('\n', outfile);
-            }
-		  else if (printflag < 0)
-		    *p++ = '\n';
+		  if (ellcc)
+		    fprintf (outfile, "\\n\\");
+		  putc ('\n', outfile);
 		}
+	      else if (printflag < 0)
+		*p++ = '\n';
 	    }
 
 	  if (c == '\\')
 	    {
-	      c = getc (infile);
+	      MDGET;
 	      if (c == '\n')
 		{
-		  c = getc (infile);
+		  MDGET;
 		  start = 1;
 		  continue;
 		}
@@ -358,32 +358,36 @@
 	  else
 	    {
 	      start = 0;
-	      if (printflag > 0) {
-                if (ellcc && c == '"')
-                  putc ('\\', outfile);
-		putc (c, outfile);
-              }
+	      if (printflag > 0)
+		{
+		  if (ellcc && c == '"')
+		    putc ('\\', outfile);
+		  putc (c, outfile);
+		}
 	      else if (printflag < 0)
 		*p++ = c;
 	    }
-	  c = getc (infile);
+	  MDGET;
 	}
       /* look for continuation of string */
       if (Current_file_type == c_file)
 	{
-	  while (isspace (c = getc (infile)))
-	    ;
+	  do
+	    {
+	      MDGET;
+	    }
+	  while (isspace (c));
 	  if (c != '"')
 	    break;
 	}
       else
 	{
-	  c = getc (infile);
+	  MDGET;
 	  if (c != '"')
 	    break;
 	  /* If we had a "", concatenate the two strings.  */
 	}
-      c = getc (infile);
+      MDGET;
     }
 
   if (printflag < 0)
@@ -396,7 +400,7 @@
    MINARGS and MAXARGS are the minimum and maximum number of arguments.  */
 
 static void
-write_c_args (FILE *out, CONST char *func, char *buff, int minargs,
+write_c_args (FILE *out, const char *func, char *buff, int minargs,
 	      int maxargs)
 {
   register char *p;
@@ -496,7 +500,7 @@
    Accepts any word starting DEF... so it finds DEFSIMPLE and DEFPRED.  */
 
 static int
-scan_c_file (CONST char *filename, CONST char *mode)
+scan_c_file (const char *filename, const char *mode)
 {
   FILE *infile;
   register int c;
@@ -787,7 +791,7 @@
 }
 
 static int
-scan_lisp_file (CONST char *filename, CONST char *mode)
+scan_lisp_file (const char *filename, const char *mode)
 {
   FILE *infile;
   register int c;