summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog4
-rw-r--r--Build/source/texk/kpathsea/mingw32.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index b970eb1b4ad..14ce6d5efd3 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2014-04-09 Luigi Scarso <luigi.scarso@gmail.com>
+
+ * mingw32.h [MinGW64]: Avoid warning due to redefining popen.
+
2014-03-21 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am, configure.ac, getopt.h: Revert previous change.
diff --git a/Build/source/texk/kpathsea/mingw32.h b/Build/source/texk/kpathsea/mingw32.h
index 358ae604c5b..e8147e5198a 100644
--- a/Build/source/texk/kpathsea/mingw32.h
+++ b/Build/source/texk/kpathsea/mingw32.h
@@ -1,6 +1,6 @@
/* mingw32.h: declarations for mingw32.
- Copyright 2009-2012 Taco Hoekwater <taco@luatex.org>.
+ Copyright 2009-2014 Taco Hoekwater <taco@luatex.org>.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -76,6 +76,7 @@ win32_popen (const char *command, const char *fmode)
return _popen (command, mode);
}
+#undef popen
#define popen(cmd, mode) win32_popen(cmd, mode)
#ifdef __cplusplus