summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-09 18:01:08 +0000
committerKarl Berry <karl@freefriends.org>2014-04-09 18:01:08 +0000
commit7206ad0ed44447bc50593d829edc743f43543de9 (patch)
treec133b1c2cac5a4a6699f336823eb77b97f12ff1f
parent6003424afae7ca5e6e03b50bff841127c8d85646 (diff)
include types.h before str-llist.h, sigh
git-svn-id: svn://tug.org/texlive/trunk@33420 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/kpathsea/ChangeLog8
-rw-r--r--Build/source/texk/kpathsea/pathsearch.h11
2 files changed, 17 insertions, 2 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 14ce6d5efd3..1d9d5e68925 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,11 @@
+2014-04-09 Karl Berry <karl@tug.org>
+
+ * pathsearch.h: with deep regret, #include types.h before
+ str-llist.h, since otherwise str_llist_type is not defined
+ in its use within types.h. Reported by Norman Gray, tex-k
+ 14 Apr 2013 12:23:50,
+ http://tug.org/pipermail/tex-k/2013-April/002496.html.
+
2014-04-09 Luigi Scarso <luigi.scarso@gmail.com>
* mingw32.h [MinGW64]: Avoid warning due to redefining popen.
diff --git a/Build/source/texk/kpathsea/pathsearch.h b/Build/source/texk/kpathsea/pathsearch.h
index 66227bdfd1d..2a87df7ee94 100644
--- a/Build/source/texk/kpathsea/pathsearch.h
+++ b/Build/source/texk/kpathsea/pathsearch.h
@@ -1,6 +1,7 @@
/* pathsearch.h: mostly-generic path searching.
- Copyright 1993, 1994, 1996, 1997, 2007, 2008, 2009, 2011, 2012 Karl Berry.
+ Copyright 1993, 1994, 1996, 1997, 2007, 2008, 2009, 2011, 2012,
+ 2014 Karl Berry.
Copyright 1999-2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -20,8 +21,14 @@
#define KPATHSEA_PATHSEARCH_H
#include <kpathsea/c-proto.h>
-#include <kpathsea/str-llist.h>
+
+/* Very sadly, types.h must be included before str-llist.h, because
+ types.h itself also includes str-llist.h, and its following use of
+ str_llist_type would not be defined if we have str-llist.h first
+ here. All follows from types.h including nearly everything so that
+ MetaPost can be a threaded library. */
#include <kpathsea/types.h>
+#include <kpathsea/str-llist.h>
#ifdef __cplusplus
extern "C" {