updated macros.

[putex/putex.git] / src / texsourc / texmf.h

diff --git a/src/texsourc/texmf.h b/src/texsourc/texmf.h
index ef61ad6..afa261b 100644 (file)
--- a/src/texsourc/texmf.h
+++ b/src/texsourc/texmf.h
@@ -21,7 +21,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301 USA.  */
 
-#include "config.h"
+#include "yandytex.h"
 
 #include <stdarg.h>
 
@@ -59,7 +59,7 @@ extern bool input_line (FILE *);
    passed in as a global variable, `name_of_file'.  */
    
 #define b_open_in(f)  open_input  (&(f), TFMFILEPATH, FOPEN_RBIN_MODE)
-#define w_open_in(f)  open_input  (&(f), dump_path, FOPEN_RBIN_MODE)
+#define w_open_in(f)  open_input  (&(f), TEXFORMATPATH, FOPEN_RBIN_MODE)
 #define b_open_out(f) open_output (&(f), FOPEN_WBIN_MODE)
 #define w_open_out    b_open_out
 #define b_close       a_close
@@ -76,14 +76,11 @@ extern bool input_line (FILE *);
   #define dumpcore abort
 #endif
 
-#ifndef unix
-#ifdef TeX
-#define write_dvi(a, b)                                                 \
-  if (fwrite ((char *) &dvi_buf[a], sizeof (dvi_buf[a]),                \
-         (int) ((b) - (a) + 1), dvi_file) != (size_t) ((b) - (a) + 1))  \
+#define write_dvi(a, b)                                           \
+  if ((size_t) fwrite ((char *) &dvi_buf[a], sizeof (dvi_buf[a]), \
+         (size_t) ((size_t)(b) - (size_t)(a) + 1), dvi_file)      \
+         != (size_t) ((size_t)(b) - (size_t)(a) + 1))             \
      FATAL_PERROR ("\n! dvi file")
-#endif /* not TeX */
-#endif /* unix */
 
 extern int do_dump (char *, int, int, FILE *);
 extern int do_undump (char *, int, int, FILE *);