summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/xdvik/ChangeLog.TL10
-rw-r--r--Build/source/texk/xdvik/dvi-draw.c1
-rw-r--r--Build/source/texk/xdvik/gui/message-window.c2
-rw-r--r--Build/source/texk/xdvik/gui/statusline.c2
-rw-r--r--Build/source/texk/xdvik/string-utils.h2
-rw-r--r--Build/source/texk/xdvik/tests/test_string_utils.c2
-rw-r--r--Build/source/texk/xdvik/xdvi.h23
7 files changed, 15 insertions, 27 deletions
diff --git a/Build/source/texk/xdvik/ChangeLog.TL b/Build/source/texk/xdvik/ChangeLog.TL
index d2e267af8b0..6caa6593803 100644
--- a/Build/source/texk/xdvik/ChangeLog.TL
+++ b/Build/source/texk/xdvik/ChangeLog.TL
@@ -1,6 +1,16 @@
ChangeLog.TL: Changes for xdvik (TeX Live)
==================================================
+2009-06-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * dvi-draw.c: do not #include "kpathsea/c-vararg.h" (after
+ #include <stdarg.h>).
+ * string-utils.h, xdvi.h, gui/message-window.c,
+ gui/statusline.c, tests/test_string_utils.c:
+ #include <stdarg.h>, not "kpathsea/c-vararg.h".
+
+ * xdvi.h: remove NeedFunctionPrototypes et al.
+
2009-06-03 Peter Breitenlohner <peb@mppmu.mpg.de>
* events.c: avoid declaration after statement.
diff --git a/Build/source/texk/xdvik/dvi-draw.c b/Build/source/texk/xdvik/dvi-draw.c
index a9a17a9f36d..b046d14ef78 100644
--- a/Build/source/texk/xdvik/dvi-draw.c
+++ b/Build/source/texk/xdvik/dvi-draw.c
@@ -43,7 +43,6 @@ in xdvi.c.
#include "kpathsea/c-stat.h"
#include "kpathsea/magstep.h"
#include "kpathsea/tex-file.h"
-#include "kpathsea/c-vararg.h"
#include <string.h>
diff --git a/Build/source/texk/xdvik/gui/message-window.c b/Build/source/texk/xdvik/gui/message-window.c
index a034c8cdbde..093ee33548c 100644
--- a/Build/source/texk/xdvik/gui/message-window.c
+++ b/Build/source/texk/xdvik/gui/message-window.c
@@ -78,7 +78,7 @@ by the user (as a rough guide: a delay of more than half a second)
# include <X11/Xaw/Dialog.h>
#endif
-#include "kpathsea/c-vararg.h"
+#include <stdarg.h>
#include "xdvi.h"
#include "util.h"
#include "string-utils.h"
diff --git a/Build/source/texk/xdvik/gui/statusline.c b/Build/source/texk/xdvik/gui/statusline.c
index 67a5e370041..a612231c05a 100644
--- a/Build/source/texk/xdvik/gui/statusline.c
+++ b/Build/source/texk/xdvik/gui/statusline.c
@@ -32,7 +32,7 @@
#include "pagehist.h"
#include "util.h"
-#include "kpathsea/c-vararg.h"
+#include <stdarg.h>
#include "my-vsnprintf.h"
#include <ctype.h>
diff --git a/Build/source/texk/xdvik/string-utils.h b/Build/source/texk/xdvik/string-utils.h
index 2439d56c5ea..7ef7f3e1784 100644
--- a/Build/source/texk/xdvik/string-utils.h
+++ b/Build/source/texk/xdvik/string-utils.h
@@ -2,7 +2,7 @@
#define STRING_UTILS_H_
#include "xdvi-config.h"
-#include "kpathsea/c-vararg.h"
+#include <stdarg.h>
#include "my-vsnprintf.h"
extern Boolean str_is_prefix(const char *, const char *, Boolean case_sensitive);
diff --git a/Build/source/texk/xdvik/tests/test_string_utils.c b/Build/source/texk/xdvik/tests/test_string_utils.c
index c8a7dadb3bb..086d54dad13 100644
--- a/Build/source/texk/xdvik/tests/test_string_utils.c
+++ b/Build/source/texk/xdvik/tests/test_string_utils.c
@@ -1,6 +1,6 @@
#include "xdvi-config.h"
#include "xdvi.h"
-#include "kpathsea/c-vararg.h"
+#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/Build/source/texk/xdvik/xdvi.h b/Build/source/texk/xdvik/xdvi.h
index 7c21bd90f46..ebdfd3a2983 100644
--- a/Build/source/texk/xdvik/xdvi.h
+++ b/Build/source/texk/xdvik/xdvi.h
@@ -245,23 +245,7 @@ typedef unsigned long xuint32;
extern KPSEDLL char *kpathsea_version_string;
-#ifndef NeedFunctionPrototypes
-# if __STDC__
-# define NeedFunctionPrototypes 1
-# else
-# define NeedFunctionPrototypes 0
-# endif
-#endif
-
-#ifndef NeedWidePrototypes
-# define NeedWidePrototypes NeedFunctionPrototypes
-#endif
-
-#ifndef NeedVarargsPrototypes
-# define NeedVarargsPrototypes NeedFunctionPrototypes
-#endif
-
-#include "kpathsea/c-vararg.h"
+#include <stdarg.h>
#include "kpathsea/c-fopen.h"
#ifndef _XFUNCPROTOBEGIN
@@ -318,13 +302,8 @@ extern KPSEDLL char *kpathsea_version_string;
typedef unsigned char ubyte;
-/* #if NeedWidePrototypes */ /* bug #1570481 */
typedef unsigned int wide_ubyte;
typedef int wide_bool;
-/* #else */
-/* typedef ubyte wide_ubyte; */
-/* typedef Boolean wide_bool; */
-/* #endif */
#if defined(MAKEPK) && !defined(MKTEXPK)
# define MKTEXPK 1