summaryrefslogtreecommitdiff
path: root/Build/source/texk/dvipos
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-25 15:17:05 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-02-25 15:17:05 +0000
commit332825cfb757edbb7ef1fffb5c941dfe4e2f3404 (patch)
treed3798d6165e36e8930aff57a004fe09ad1e9592f /Build/source/texk/dvipos
parentfe266860c555d8dbc9592a0c2d273da711cb3141 (diff)
minor
git-svn-id: svn://tug.org/texlive/trunk@17204 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/dvipos')
-rw-r--r--Build/source/texk/dvipos/ChangeLog5
-rw-r--r--Build/source/texk/dvipos/dvipos.c2
-rw-r--r--Build/source/texk/dvipos/utils.h8
3 files changed, 7 insertions, 8 deletions
diff --git a/Build/source/texk/dvipos/ChangeLog b/Build/source/texk/dvipos/ChangeLog
index 665e1735090..266458772fe 100644
--- a/Build/source/texk/dvipos/ChangeLog
+++ b/Build/source/texk/dvipos/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * utils.h: Revert the last changes from Feb 20 and 23.
+ * dvipos.c: Don't #include <getopt.h> with kpathsea or MinGW32.
+
2010-02-23 Peter Breitenlohner <peb@mppmu.mpg.de>
* utils.h: Also need to #include <kpathsea/c-ctype.h>.
diff --git a/Build/source/texk/dvipos/dvipos.c b/Build/source/texk/dvipos/dvipos.c
index e945b23e04d..da1fff0cd2a 100644
--- a/Build/source/texk/dvipos/dvipos.c
+++ b/Build/source/texk/dvipos/dvipos.c
@@ -21,7 +21,7 @@
#include "dvicore.h"
#include <limits.h>
-#ifdef WIN32
+#if defined(MIKTEX) && defined(WIN32) && !defined(__MINGW32__)
#include <getopt.h>
#endif
diff --git a/Build/source/texk/dvipos/utils.h b/Build/source/texk/dvipos/utils.h
index af06ad33ecc..25c5e03938d 100644
--- a/Build/source/texk/dvipos/utils.h
+++ b/Build/source/texk/dvipos/utils.h
@@ -27,13 +27,7 @@
#include "gnu-miktex.h"
#include "web2c-miktex.h"
#else
-#include <kpathsea/config.h>
-#include <kpathsea/c-auto.h>
-#include <kpathsea/c-ctype.h>
-#include <kpathsea/tex-file.h>
-#ifndef WIN32
-#include <kpathsea/getopt.h>
-#endif
+#include <kpathsea/kpathsea.h>
#endif
typedef int UNSIGNED_BYTE, SIGNED_BYTE, SIGNED_PAIR;