[NTG-pdftex] pdftex-1.40.0-alpha-20060106

[Akira Kakuto]

Hi Martin,

> http://sarovar.org/download.php/890/pdftex-1.40.0-alpha-20051226-20060106.diff.gz
> http://sarovar.org/download.php/891/pdftex-1.40.0-alpha-20060106.tar.bz2
> 
> - many small fixes to remove warnings from -Wall
> ...

Please change tex-make.c as follows, though the corrected lines
are rarely used in real life.

Thanks
Akira

--- tex-make.c.orig	Wed Dec 28 01:15:25 2005
+++ tex-make.c	Sat Jan 07 08:27:10 2006
@@ -30,8 +30,9 @@
 #include <kpathsea/readable.h>
 #include <kpathsea/tex-make.h>
 #include <kpathsea/variable.h>
-#include <sys/wait.h>
-
+#ifndef  WIN32
+#  include <sys/wait.h>
+#endif
 
 /* We never throw away stdout, since that is supposed to be the filename
    found, if all is successful.  This variable controls whether stderr
@@ -67,13 +68,13 @@
 
           if (f > 1) {
               if (r > 0) {
-                  sprintf(q, "%u+%u/(%u*%u + %u)",
+                  sprintf(q, "%u+%u/(%u*%u+%u)",
                           dpi/bdpi, dpi%bdpi, f, (bdpi - r)/f, r);
               } else {
                   sprintf(q, "%u+%u/(%u*%u)", dpi/bdpi, dpi%bdpi, f, bdpi/f);
               }
           } else {
-              sprintf(q, "%u+%u/(4000 + %u)", dpi/bdpi, dpi%bdpi, bdpi);
+              sprintf(q, "%u+%u/(4000+%u)", dpi/bdpi, dpi%bdpi, r);
           }
       }
   } else {