summaryrefslogtreecommitdiff
path: root/Build/source/texk/kpathsea
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-17 11:02:17 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-03-17 11:02:17 +0000
commitcc9e2cf485fdc6d0689f5943154c593d9f3696e6 (patch)
treecf6d7f26a372ab41a291c58597e0da38204c79b2 /Build/source/texk/kpathsea
parentf02c90b67527cfb210815f40184019554d107cbd (diff)
make kpathsea C++ safe, adapt xdv2pdf to new kpathsea API
git-svn-id: svn://tug.org/texlive/trunk@12405 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog4
-rw-r--r--Build/source/texk/kpathsea/c-std.h4
-rw-r--r--Build/source/texk/kpathsea/getopt.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 983b83b762e..cad1832c652 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-17 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * c-std.h, getopt.h: Avoid non-prototype declarations for C++.
+
2009-03-16 Peter Breitenlohner <peb@mppmu.mpg.de>
* db.c, debug.c, debug.h, dir.c, elt-dirs.c, hash.c, pathsearch.c,
diff --git a/Build/source/texk/kpathsea/c-std.h b/Build/source/texk/kpathsea/c-std.h
index 980c115901f..40e0ce78bd0 100644
--- a/Build/source/texk/kpathsea/c-std.h
+++ b/Build/source/texk/kpathsea/c-std.h
@@ -87,12 +87,12 @@ extern ALLOC_RETURN_TYPE *calloc (), *malloc (), *realloc ();
#include <unixlib.h>
#include <unixio.h>
#else
-#ifndef WIN32
+#if !defined (WIN32) && !defined (__cplusplus)
/* `popen' and `pclose' are part of POSIX.2, not POSIX.1. So
STDC_HEADERS isn't enough. */
extern FILE *popen ();
extern int pclose ();
-#endif /* not WIN32 */
+#endif /* not WIN32 && not __cplusplus */
#endif /* not VMS */
#endif /* not KPATHSEA_C_STD_H */
diff --git a/Build/source/texk/kpathsea/getopt.h b/Build/source/texk/kpathsea/getopt.h
index 49efaff3b8a..c0098f19ba6 100644
--- a/Build/source/texk/kpathsea/getopt.h
+++ b/Build/source/texk/kpathsea/getopt.h
@@ -123,7 +123,9 @@ struct option
errors, only prototype getopt for the GNU C library. */
extern KPSEDLL int getopt (int argc, char *const *argv, const char *shortopts);
#else /* not __GNU_LIBRARY__ */
+#ifndef __cplusplus
extern KPSEDLL int getopt ();
+#endif /* not __cplusplus */
#endif /* __GNU_LIBRARY__ */
extern KPSEDLL int getopt_long (int argc, char *const *argv, const char *shortopts,
const struct option *longopts, int *longind);