6 files changed, 16 insertions, 10 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index eea20f93b31..1f92c67950a 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,5 +1,11 @@
 2010-05-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
+	* dvips.h [SET_BINARY]: Add cast to void.
+	* afm2tfm.c, finclude.c, output.c, search.c (SET_BINARY): Once
+	again remove casts to void.
+
+2010-05-10  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
 	* all files: Remove more useless casts to void.
 
 	* afm2tfm.c, finclude.c, output.c, search.c: Reintroduce a few
diff --git a/Build/source/texk/dvipsk/afm2tfm.c b/Build/source/texk/dvipsk/afm2tfm.c
index 7d05bf877f6..bf02aa79ee9 100644
--- a/Build/source/texk/dvipsk/afm2tfm.c
+++ b/Build/source/texk/dvipsk/afm2tfm.c
@@ -1687,7 +1687,7 @@ default: fprintf(stderr, "Unknown option %s %s ignored.\n", argv[2], argv[3]);
    if ((afmin=fopen(inname, "r"))==NULL)
       error("! can't open afm input file");
 #endif /* KPATHSEA */
-   (void)SET_BINARY(fileno(afmin));
+   SET_BINARY(fileno(afmin));
 
    if (argc>3 || (argc==3 && *argv[2]=='-')) {
      error("! need at most two non-option arguments");
@@ -1979,7 +1979,7 @@ readencoding(char *enc)
 #else
       afmin = fopen(enc, "r");
 #endif
-      (void)SET_BINARY(fileno(afmin));
+      SET_BINARY(fileno(afmin));
       param = 0;
       if (afmin == 0)
 #ifdef KPATHSEA
diff --git a/Build/source/texk/dvipsk/dvips.h b/Build/source/texk/dvipsk/dvips.h
index 74025cdb90f..6cc1389dcaa 100644
--- a/Build/source/texk/dvipsk/dvips.h
+++ b/Build/source/texk/dvipsk/dvips.h
@@ -330,9 +330,9 @@ struct papsiz {
 #include <fcntl.h>
 #define O_BINARY _O_BINARY
 #define register
-#define SET_BINARY(fd) _setmode((fd), _O_BINARY)
+#define SET_BINARY(fd) (void)_setmode((fd), _O_BINARY)
 #else /* !WIN32 */
-#define SET_BINARY(fd) 0
+#define SET_BINARY(fd) (void)0
 #endif
 
 #if defined(DEVICESEP)
diff --git a/Build/source/texk/dvipsk/finclude.c b/Build/source/texk/dvipsk/finclude.c
index eac10dccaa6..44943924ea3 100644
--- a/Build/source/texk/dvipsk/finclude.c
+++ b/Build/source/texk/dvipsk/finclude.c
@@ -394,13 +394,13 @@ scanfontcomments(const char *filename)
  *   Allow scanning of ` commands.  Better return same results both times.
  */
       f = popen(filename+1, "r");
-      (void)SET_BINARY(fileno(f));
+      SET_BINARY(fileno(f));
       to_close = USE_PCLOSE;
    } else {
       f = search(figpath, filename, READ);
    }
    if (f) {
-     (void)SET_BINARY(fileno(f));
+     SET_BINARY(fileno(f));
      fc_state = 0;
      check_atend = 0;
      while (fgets(p,500,f) && p[0]=='%' &&
diff --git a/Build/source/texk/dvipsk/output.c b/Build/source/texk/dvipsk/output.c
index 467066c62d3..c3aa22a435f 100644
--- a/Build/source/texk/dvipsk/output.c
+++ b/Build/source/texk/dvipsk/output.c
@@ -152,7 +152,7 @@ copyfile_general(const char *s, struct header_list *cur_header)
          sprintf(errbuf, "Execution of  <%s> failed ", s);
          f = popen(s, "r");
          if (f != 0)
-            (void)SET_BINARY(fileno(f));
+            SET_BINARY(fileno(f));
 	}
 	else {
       sprintf(errbuf,"Secure mode is %d so execute <%s> will not run", secure,s);
@@ -1310,7 +1310,7 @@ open_output(void) {
 #endif
 	 if (pf == NULL && (pf = popen(oname+1, "w")) != NULL) {
 	    popened = 1;
-	    (void)SET_BINARY(fileno(pf));
+	    SET_BINARY(fileno(pf));
 	 }
          if (pf == NULL)
             error("! couldn't open output pipe");
@@ -1322,7 +1322,7 @@ open_output(void) {
       } else {
          if ((bitfile=fopen(oname,"w"))==NULL)
             error("! couldn't open PostScript file");
-         (void)SET_BINARY(fileno(bitfile));
+         SET_BINARY(fileno(bitfile));
       }
    } else {
       bitfile = stdout;
diff --git a/Build/source/texk/dvipsk/search.c b/Build/source/texk/dvipsk/search.c
index 7259b8ef445..e135ef2cd67 100644
--- a/Build/source/texk/dvipsk/search.c
+++ b/Build/source/texk/dvipsk/search.c
@@ -146,7 +146,7 @@ search(kpse_file_format_type format, const char *file, const char *mode)
       char *prog = selfautoloc_prog (GUNZIP);
       cmd = concat3 (prog, " -c ", quoted_name);
       ret = popen (cmd, "r");
-      (void)SET_BINARY(fileno(ret));
+      SET_BINARY(fileno(ret));
       to_close = USE_PCLOSE;
       free (cmd);
       free (quoted_name);