summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-07-09 12:44:51 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-07-09 12:44:51 +0000
commitc382fe80a1ba2c30e44f541004692634ff8d58c5 (patch)
tree3409efdcfe71803b175d236b514e9c0cc31c9f84
parent3165c4829bd2e3ac5e937aae139bdaeea0fd239b (diff)
pdfTeX: Use #include <regex.h> for __MINGW32__ as for Unix
git-svn-id: svn://tug.org/texlive/trunk@26970 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/pdftexdir/am/libpdftex.am5
-rw-r--r--Build/source/texk/web2c/pdftexdir/utils.c4
3 files changed, 9 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 193779bdf95..b95008e9d39 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * utils.c [__MINGW32__]: #include <regex.h> as for Unix instead
+ of <regex/regex.h>.
+ * am/libpdftex.am (libpdftex_a_CPPFLAGS): Change accordingly.
+
2012-06-21 Peter Breitenlohner <peb@mppmu.mpg.de>
* pdftosrc.cc: Use XRef::getNumObjects instead of XRef::getSize,
diff --git a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
index 32cb0e889d1..c7c5042585f 100644
--- a/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
+++ b/Build/source/texk/web2c/pdftexdir/am/libpdftex.am
@@ -1,13 +1,13 @@
## texk/web2c/pdftexdir/am/libpdftex.am: Makefile fragment for libpdftex.
##
-## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
## libpdftex
##
EXTRA_LIBRARIES += libpdftex.a
-libpdftex_a_CPPFLAGS = $(pdftex_cppflags)
+libpdftex_a_CPPFLAGS = $(REGEX_INCLUDES) $(pdftex_cppflags)
libpdftex_a_CXXFLAGS = # $(WARNING_CXXFLAGS)
libpdftex_a_SOURCES = \
@@ -41,6 +41,7 @@ libpdftex_a_SOURCES = \
pdftexdir/writezip.c
if MINGW32
+REGEX_INCLUDES = -I$(srcdir)/pdftexdir/regex
libpdftex_a_SOURCES += \
pdftexdir/regex/regex.c \
pdftexdir/regex/regex.h
diff --git a/Build/source/texk/web2c/pdftexdir/utils.c b/Build/source/texk/web2c/pdftexdir/utils.c
index 776a99dd7e5..af8794df243 100644
--- a/Build/source/texk/web2c/pdftexdir/utils.c
+++ b/Build/source/texk/web2c/pdftexdir/utils.c
@@ -25,11 +25,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#else
#include <sysexits.h>
#endif
-#ifdef __MINGW32__
-#include <regex/regex.h>
-#else
#include <regex.h>
-#endif
#include <kpathsea/c-proto.h>
#include <kpathsea/c-stat.h>
#include <kpathsea/c-fopen.h>