summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvi2tty
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-28 13:27:05 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-28 13:27:05 +0000
commit63800a99fb223f2d7c4253c71a0488af1aede23e (patch)
treefcad34bcd26d2bba3158453e4482b8c0b681ba70 /Build/source/texk/dvi2tty
parent5c8f5c4c20e8920b2f8e2c74653551163bda28de (diff)
Include the Autoconf generated headers always first
git-svn-id: svn://tug.org/texlive/trunk@31002 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvi2tty')
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog4
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-08-config_h68
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-5.3.4/disdvi.c12
-rw-r--r--Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.h22
4 files changed, 89 insertions, 17 deletions
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog
index 579a8cf1487..00507bff7ec 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-28 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-08-config_h (new): First include <kpathsea/config.h>.
+
2012-09-06 Peter Breitenlohner <peb@mppmu.mpg.de>
* patch-07-win32 [WIN32]: Use "sjis" file encoding (from W32TeX).
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-08-config_h b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-08-config_h
new file mode 100644
index 00000000000..06c4230df28
--- /dev/null
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4-PATCHES/patch-08-config_h
@@ -0,0 +1,68 @@
+diff -ur dvi2tty-5.3.4.orig/disdvi.c dvi2tty-5.3.4/disdvi.c
+--- dvi2tty-5.3.4.orig/disdvi.c 2012-06-22 09:12:43.000000000 +0200
++++ dvi2tty-5.3.4/disdvi.c 2013-06-28 15:02:13.000000000 +0200
+@@ -45,6 +45,12 @@
+ * Include files
+ */
+
++#if defined(KPATHSEA)
++# define NO_DEBUG 1
++# include <kpathsea/config.h>
++# include <kpathsea/lib.h>
++#endif
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #if defined(MSDOS) || defined(WIN32)
+@@ -61,12 +67,6 @@
+ # include "macintosh.h"
+ #endif
+
+-#if defined(KPATHSEA)
+-# define NO_DEBUG 1
+-# include <kpathsea/config.h>
+-# include <kpathsea/lib.h>
+-#endif
+-
+
+ /*
+ * Constant definitions
+diff -ur dvi2tty-5.3.4.orig/dvi2tty.h dvi2tty-5.3.4/dvi2tty.h
+--- dvi2tty-5.3.4.orig/dvi2tty.h 2012-06-22 09:09:35.000000000 +0200
++++ dvi2tty-5.3.4/dvi2tty.h 2013-06-28 15:02:13.000000000 +0200
+@@ -25,17 +25,6 @@
+ Copyright (C) 1989-2010 M.J.E. Mol, MESA Consulting B.V."
+
+
+-#include <stdio.h>
+-#include <string.h>
+-#include <stdlib.h>
+-#if defined(MSDOS) || (defined(WIN32) && !defined(__MINGW32__))
+-# include <malloc.h>
+-#else
+-# if !defined(THINK_C)
+-# include <unistd.h>
+-# endif
+-#endif
+-
+ #if defined(KPATHSEA)
+ # define NO_DEBUG 1
+ # include <kpathsea/config.h>
+@@ -47,6 +36,17 @@
+ # define FALSE 0
+ #endif
+
++#include <stdio.h>
++#include <string.h>
++#include <stdlib.h>
++#if defined(MSDOS) || (defined(WIN32) && !defined(__MINGW32__))
++# include <malloc.h>
++#else
++# if !defined(THINK_C)
++# include <unistd.h>
++# endif
++#endif
++
+ #define nil NULL
+
+ /*
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.4/disdvi.c b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/disdvi.c
index 43403e0f339..8e05ec42425 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.4/disdvi.c
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/disdvi.c
@@ -45,6 +45,12 @@ const char *disdvi = "@(#) disdvi.c 2.26 20101027 M.J.E. Mol (c) 1989-2010, mar
* Include files
*/
+#if defined(KPATHSEA)
+# define NO_DEBUG 1
+# include <kpathsea/config.h>
+# include <kpathsea/lib.h>
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#if defined(MSDOS) || defined(WIN32)
@@ -61,12 +67,6 @@ const char *disdvi = "@(#) disdvi.c 2.26 20101027 M.J.E. Mol (c) 1989-2010, mar
# include "macintosh.h"
#endif
-#if defined(KPATHSEA)
-# define NO_DEBUG 1
-# include <kpathsea/config.h>
-# include <kpathsea/lib.h>
-#endif
-
/*
* Constant definitions
diff --git a/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.h b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.h
index 21825f95db3..7677c09e3d7 100644
--- a/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.h
+++ b/Build/source/texk/dvi2tty/dvi2tty-5.3.4/dvi2tty.h
@@ -25,17 +25,6 @@
Copyright (C) 1989-2010 M.J.E. Mol, MESA Consulting B.V."
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#if defined(MSDOS) || (defined(WIN32) && !defined(__MINGW32__))
-# include <malloc.h>
-#else
-# if !defined(THINK_C)
-# include <unistd.h>
-# endif
-#endif
-
#if defined(KPATHSEA)
# define NO_DEBUG 1
# include <kpathsea/config.h>
@@ -47,6 +36,17 @@ Copyright (C) 1989-2010 M.J.E. Mol, MESA Consulting B.V."
# define FALSE 0
#endif
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#if defined(MSDOS) || (defined(WIN32) && !defined(__MINGW32__))
+# include <malloc.h>
+#else
+# if !defined(THINK_C)
+# include <unistd.h>
+# endif
+#endif
+
#define nil NULL
/*