summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-04-27 22:31:50 +0000
committerKarl Berry <karl@freefriends.org>2008-04-27 22:31:50 +0000
commit0c013b82a68910bec6d29748fa234e34e6577f42 (patch)
treedc01fa61c280a3f1db0c26eb12e9eac8ca878c15
parentc11d147f674418c847354ad89f4c29e6b4edb548 (diff)
fopen decl if #undef
git-svn-id: svn://tug.org/texlive/trunk@7685 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/dvipsk/ChangeLog8
-rw-r--r--Build/source/texk/dvipsk/afm2tfm.c7
-rw-r--r--Build/source/texk/dvipsk/dvips.h4
-rw-r--r--Build/source/texk/dvipsk/squeeze.c10
4 files changed, 23 insertions, 6 deletions
diff --git a/Build/source/texk/dvipsk/ChangeLog b/Build/source/texk/dvipsk/ChangeLog
index 2069a8bc828..9d26e99c852 100644
--- a/Build/source/texk/dvipsk/ChangeLog
+++ b/Build/source/texk/dvipsk/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-28 Karl Berry <karl@tug.org>
+
+ * dvips.h: id.
+ * squeeze.c [!KPATHSEA]: conditionalize #undef fopen,
+ and add decl with return type.
+ * afm2tfm.c: semi-prototype fopen if it got #undef'd.
+ Bug report from vvv, 27 Apr 2008 13:43:37.
+
2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* acconfig.h: removed.
diff --git a/Build/source/texk/dvipsk/afm2tfm.c b/Build/source/texk/dvipsk/afm2tfm.c
index c275914c1c1..c946f7ef91e 100644
--- a/Build/source/texk/dvipsk/afm2tfm.c
+++ b/Build/source/texk/dvipsk/afm2tfm.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
/* Public domain, originally written by Tom Rokicki.
* This program converts AFM files to TeX TFM files, and optionally
* to TeX VPL files that retain all kerning and ligature information.
@@ -59,12 +61,13 @@ extern char ascii2ebcdic[] ;
#undef fopen
#endif
#define fopen cmsfopen
-#endif
+#endif /* VMCMS */
#include "dvips.h"
-/* debug.h redefines fopen to my_real_fopen */
+/* debug.h redefines fopen to my_real_fopen, but it's still a FILE * */
#ifdef fopen
#undef fopen
+extern FILE *fopen ();
#endif
struct encoding {
diff --git a/Build/source/texk/dvipsk/dvips.h b/Build/source/texk/dvipsk/dvips.h
index 8eedc5c1688..1f98b2ee2ba 100644
--- a/Build/source/texk/dvipsk/dvips.h
+++ b/Build/source/texk/dvipsk/dvips.h
@@ -1,6 +1,6 @@
-/*
+/* $Id$
* This is dvips, a freely redistributable PostScript driver
- * for dvi files. It is (C) Copyright 1986-2007 by Tomas Rokicki.
+ * for dvi files. It is (C) Copyright 1986-2008 by Tomas Rokicki.
* You may freely use, modify and/or distribute this program or any
* portion thereof.
*/
diff --git a/Build/source/texk/dvipsk/squeeze.c b/Build/source/texk/dvipsk/squeeze.c
index c1c61744e9c..72a2609c7f7 100644
--- a/Build/source/texk/dvipsk/squeeze.c
+++ b/Build/source/texk/dvipsk/squeeze.c
@@ -1,4 +1,7 @@
-/*
+/* $Id$
+ * Copyright 1986-2008 Tomas Rokicki.
+ * You may freely use, modify and/or distribute this program or any
+ * portion thereof.
* This routine squeezes a PostScript file down to its
* minimum. We parse and then output it.
*/
@@ -12,9 +15,12 @@
#include <stdlib.h>
#include <string.h>
#include "dvips.h" /* The copyright notice in that file is included too! */
-#endif
+#endif /* !KPATHSEA */
+
+/* debug.h redefines fopen to my_real_fopen, but it's still a FILE * */
#ifdef fopen
#undef fopen
+extern FILE *fopen ();
#endif
#define LINELENGTH (72)