summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/kpathsea/ChangeLog24
-rw-r--r--Build/source/texk/kpathsea/db.h11
-rw-r--r--Build/source/texk/kpathsea/fontmap.h5
-rw-r--r--Build/source/texk/kpathsea/getopt.h8
-rw-r--r--Build/source/texk/kpathsea/hash.h6
-rw-r--r--Build/source/texk/kpathsea/mingw32.h4
-rw-r--r--Build/source/texk/kpathsea/str-list.h10
-rw-r--r--Build/source/texk/kpathsea/str-llist.h5
-rw-r--r--Build/source/texk/kpathsea/tex-file.h5
-rw-r--r--Build/source/texk/kpathsea/tex-make.h2
-rw-r--r--Build/source/texk/kpathsea/tilde.h5
-rw-r--r--Build/source/texk/kpathsea/truncate.h6
-rw-r--r--Build/source/texk/kpathsea/xopendir.h6
-rw-r--r--Build/source/texk/kpathsea/xstat.h6
14 files changed, 92 insertions, 11 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index dfb09f001fd..7e26c953e29 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,27 @@
+2010-02-11 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * db.h (kpathsea_init_db, kpse_init_db, kpathsea_db_search,
+ kpse_db_search, kpathsea_db_search_list, kpse_db_search_list),
+ * fontmap.h (kpathsea_fontmap_lookup, kpse_fontmap_lookup),
+ * getopt.h (_getopt_internal),
+ * hash.h (hash_print, hash_free),
+ * mingw32.h (init_user_info, set_home_warning,
+ win32_get_long_filename, look_for_cmd, quote_args),
+ * pathsearch.h (kpathsea_filename_component,
+ kpse_filename_component, kpathsea_normalize_path,
+ kpse_normalize_path),
+ * str-list.h (str_list_init, str_list_concat, str_list_free,
+ * str_list_concat_elements, str_list_uniqify),
+ * str-llist.h (str_llist_add, str_llist_float),
+ * tex-file.h (kpathsea_init_fallback_resolutions,
+ kpse_init_fallback_resolutions),
+ * tilde.h (kpathsea_tilde_expand, kpse_tilde_expand),
+ * truncate.h (kpathsea_truncate_filename,
+ kpse_truncate_filename),
+ * xopendir.h (xopendir, xclosedir),
+ * xstat.h (xstat, xlstat): Declare prototypes only within
+ libkpathsea.
+
2010-02-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* mingw32.c (get_home_directory, _parse_root,
diff --git a/Build/source/texk/kpathsea/db.h b/Build/source/texk/kpathsea/db.h
index 11e33745af8..76dcb220e72 100644
--- a/Build/source/texk/kpathsea/db.h
+++ b/Build/source/texk/kpathsea/db.h
@@ -1,6 +1,6 @@
/* db.h: lookups in an externally built db file.
- Copyright 1994, 1995, 2008 Karl Berry.
+ Copyright 1994, 1995, 2008, 2010 Karl Berry.
Copyright 1999, 2003, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -23,6 +23,8 @@
#include <kpathsea/types.h>
#include <kpathsea/str-list.h>
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
+
/* Initialize the database. Until this is called, no ls-R matches will
be found. */
extern void kpathsea_init_db (kpathsea kpse);
@@ -41,11 +43,16 @@ extern str_list_type *kpathsea_db_search_list (kpathsea kpse,
const_string path_elt,
boolean all);
+#endif /* MAKE_KPSE_DLL */
+
/* Insert the filename FNAME into the database.
Called by mktexpk et al. */
extern KPSEDLL void kpathsea_db_insert (kpathsea kpse, const_string fname);
#if defined(KPSE_COMPAT_API)
+
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
+
extern void kpse_init_db (void);
extern str_list_type *kpse_db_search (const_string name,
@@ -55,6 +62,8 @@ extern str_list_type *kpse_db_search_list (const_string* names,
const_string path_elt,
boolean all);
+#endif /* MAKE_KPSE_DLL */
+
extern KPSEDLL void kpse_db_insert (const_string fname);
#endif
diff --git a/Build/source/texk/kpathsea/fontmap.h b/Build/source/texk/kpathsea/fontmap.h
index fcfe137ce11..2f7e21fc3fd 100644
--- a/Build/source/texk/kpathsea/fontmap.h
+++ b/Build/source/texk/kpathsea/fontmap.h
@@ -1,6 +1,6 @@
/* fontmap.h: declarations for reading a file to define additional font names.
- Copyright 1993, 1994, 1995, 2008 Karl Berry.
+ Copyright 1993, 1994, 1995, 2008, 2010 Karl Berry.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -22,6 +22,7 @@
#include <kpathsea/hash.h>
#include <kpathsea/types.h>
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
/* Look up KEY in all texfonts.map's in the glyph_format path, and
return a null-terminated list of all matching entries, or NULL. */
@@ -31,4 +32,6 @@ extern string *kpathsea_fontmap_lookup (kpathsea kpse, const_string key);
extern string *kpse_fontmap_lookup (const_string key);
#endif
+#endif /* MAKE_KPSE_DLL */
+
#endif /* not FONTMAP_H */
diff --git a/Build/source/texk/kpathsea/getopt.h b/Build/source/texk/kpathsea/getopt.h
index 932cf5d941a..d3e9aa06fd3 100644
--- a/Build/source/texk/kpathsea/getopt.h
+++ b/Build/source/texk/kpathsea/getopt.h
@@ -123,17 +123,25 @@ extern KPSEDLL int getopt_long_only (int argc, char *const *argv,
const char *shortopts,
const struct option *longopts, int *longind);
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
+
/* Internal only. Users should not call this directly. */
extern int _getopt_internal (int argc, char *const *argv,
const char *shortopts,
const struct option *longopts, int *longind,
int long_only);
+
+#endif /* MAKE_KPSE_DLL */
#else /* not __STDC__ */
extern KPSEDLL int getopt ();
extern KPSEDLL int getopt_long ();
extern KPSEDLL int getopt_long_only ();
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
+
extern int _getopt_internal ();
+
+#endif /* MAKE_KPSE_DLL */
#endif /* __STDC__ */
#ifdef __cplusplus
diff --git a/Build/source/texk/kpathsea/hash.h b/Build/source/texk/kpathsea/hash.h
index a88233fed6f..f9702b3a794 100644
--- a/Build/source/texk/kpathsea/hash.h
+++ b/Build/source/texk/kpathsea/hash.h
@@ -1,6 +1,6 @@
/* hash.h: declarations for a hash table.
- Copyright 1994, 1995, 2008 Karl Berry.
+ Copyright 1994, 1995, 2008, 2010 Karl Berry.
Copyright 1999, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -63,10 +63,14 @@ extern KPSEDLL void hash_remove (hash_table_type *table, const_string key,
values (not copies), in insertion order. If none, return NULL. */
extern KPSEDLL string *hash_lookup (hash_table_type table, const_string key);
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
+
/* Print TABLE to stderr. */
extern void hash_print (hash_table_type table, boolean summary_only);
/* Drop the TABLE */
extern void hash_free (hash_table_type table);
+#endif /* MAKE_KPSE_DLL */
+
#endif /* not HASH_H */
diff --git a/Build/source/texk/kpathsea/mingw32.h b/Build/source/texk/kpathsea/mingw32.h
index f4acbc9ce01..c8c492a8b94 100644
--- a/Build/source/texk/kpathsea/mingw32.h
+++ b/Build/source/texk/kpathsea/mingw32.h
@@ -42,10 +42,14 @@
&& IS_DIR_SEP(*(name+1)) && isalnum(*(name+2)))
#endif
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
+
extern void init_user_info (void);
extern void set_home_warning (void);
extern BOOL win32_get_long_filename (char *, char *, int);
extern BOOL look_for_cmd (const char *, char **);
extern char *quote_args(char **);
+#endif /* MAKE_KPSE_DLL */
+
#endif
diff --git a/Build/source/texk/kpathsea/str-list.h b/Build/source/texk/kpathsea/str-list.h
index eb76e12f007..cf33c726508 100644
--- a/Build/source/texk/kpathsea/str-list.h
+++ b/Build/source/texk/kpathsea/str-list.h
@@ -1,6 +1,6 @@
/* str-list.h: declarations for string lists.
- Copyright 1993, 1994, 2007, 2008 Karl Berry.
+ Copyright 1993, 1994, 2007, 2008, 2010 Karl Berry.
Copyright 1999, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -36,14 +36,20 @@ typedef struct
#define STR_LIST_ELT(l, n) STR_LIST (l)[n]
#define STR_LIST_LAST_ELT(l) STR_LIST_ELT (l, STR_LIST_LENGTH (l) - 1)
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
+
/* Return a new, empty, list. */
extern str_list_type str_list_init (void);
+#endif /* MAKE_KPSE_DLL */
+
/* Append the string S to the list L. It's up to the caller to not
deallocate S; we don't copy it. Also up to the caller to terminate
the list with a null entry. */
extern KPSEDLL void str_list_add (str_list_type *l, string s);
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
+
/* Append all the elements from MORE to TARGET. */
extern void str_list_concat (str_list_type * target, str_list_type more);
@@ -58,4 +64,6 @@ extern void str_list_concat_elements
/* Remove duplicate elements from L, freeing their space. */
extern void str_list_uniqify (str_list_type *l);
+#endif /* MAKE_KPSE_DLL */
+
#endif /* not KPATHSEA_STR_LIST_H */
diff --git a/Build/source/texk/kpathsea/str-llist.h b/Build/source/texk/kpathsea/str-llist.h
index 5b0c8f86277..894544b2d42 100644
--- a/Build/source/texk/kpathsea/str-llist.h
+++ b/Build/source/texk/kpathsea/str-llist.h
@@ -4,7 +4,7 @@
that C cannot express iterators very well, and I don't want to change
all the for loops.
- Copyright 1993, 1994, 2008 Karl Berry.
+ Copyright 1993, 1994, 2008, 2010 Karl Berry.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -44,6 +44,7 @@ typedef struct str_llist_elt *str_llist_type;
#define STR_LLIST_MOVED(sl) ((sl).moved)
#define STR_LLIST_NEXT(sl) ((sl).next)
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
/* Add the new string E to the end of the list L. */
extern void str_llist_add (str_llist_type *l, string e);
@@ -52,4 +53,6 @@ extern void str_llist_add (str_llist_type *l, string e);
been moved. Set `moved' member for E. */
extern void str_llist_float (str_llist_type *l, str_llist_elt_type *e);
+#endif /* MAKE_KPSE_DLL */
+
#endif /* not STR_LLIST_H */
diff --git a/Build/source/texk/kpathsea/tex-file.h b/Build/source/texk/kpathsea/tex-file.h
index bad4b028a42..f752c399b14 100644
--- a/Build/source/texk/kpathsea/tex-file.h
+++ b/Build/source/texk/kpathsea/tex-file.h
@@ -1,6 +1,6 @@
/* tex-file.h: find files in a particular format.
- Copyright 1993, 1994, 1995, 1996, 2007, 2008, 2009 Karl Berry.
+ Copyright 1993, 1994, 1995, 1996, 2007, 2008, 2009, 2010 Karl Berry.
Copyright 1998-2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -23,11 +23,14 @@
#include <stdarg.h>
#include <kpathsea/types.h>
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
/* This initializes the fallback resolution list. If ENVVAR
is set, it is used; otherwise, the envvar `TEXSIZES' is looked at; if
that's not set either, a compile-time default is used. */
extern void kpathsea_init_fallback_resolutions (kpathsea kpse, string envvar);
+
+#endif /* MAKE_KPSE_DLL */
/* If LEVEL is >= FMT's `program_enable_level', set `program_enabled_p'
for FMT to VALUE. */
diff --git a/Build/source/texk/kpathsea/tex-make.h b/Build/source/texk/kpathsea/tex-make.h
index 5a446248ea1..376d5acf7f9 100644
--- a/Build/source/texk/kpathsea/tex-make.h
+++ b/Build/source/texk/kpathsea/tex-make.h
@@ -1,6 +1,6 @@
/* tex-make.h: declarations for executing external scripts.
- Copyright 1993, 1994, 2008 Karl Berry.
+ Copyright 1993, 1994, 2008, 2010 Karl Berry.
Copyright 1999, 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
diff --git a/Build/source/texk/kpathsea/tilde.h b/Build/source/texk/kpathsea/tilde.h
index abf64ffa447..b769892564b 100644
--- a/Build/source/texk/kpathsea/tilde.h
+++ b/Build/source/texk/kpathsea/tilde.h
@@ -1,6 +1,6 @@
/* tilde.h: declare tilde expander.
- Copyright 1993, 2008 Karl Berry.
+ Copyright 1993, 2008, 2010 Karl Berry.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -21,6 +21,7 @@
#include <kpathsea/c-proto.h>
#include <kpathsea/types.h>
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
/* Replace a leading ~ or ~NAME in FILENAME with getenv ("HOME"), or
getenv ('USERPROFILE") on Windows, or with NAME's home directory,
@@ -32,4 +33,6 @@ extern string kpathsea_tilde_expand (kpathsea kpse, const_string filename);
extern string kpse_tilde_expand (const_string filename);
#endif
+#endif /* MAKE_KPSE_DLL */
+
#endif /* not KPATHSEA_TILDE_H */
diff --git a/Build/source/texk/kpathsea/truncate.h b/Build/source/texk/kpathsea/truncate.h
index 893cc728f45..824daa16ec3 100644
--- a/Build/source/texk/kpathsea/truncate.h
+++ b/Build/source/texk/kpathsea/truncate.h
@@ -1,6 +1,6 @@
/* truncate.h: truncate too-long components in a filename.
- Copyright 1993, 2008 Karl Berry.
+ Copyright 1993, 2008, 2010 Karl Berry.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -21,6 +21,8 @@
#include <kpathsea/c-proto.h>
#include <kpathsea/types.h>
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
+
/* Truncate any component in NAME longer than the system NAME_MAX, and
return the result as a malloced string. If none, return a copy of
NAME. */
@@ -30,4 +32,6 @@ extern string kpathsea_truncate_filename (kpathsea kpse, const_string name);
extern string kpse_truncate_filename (const_string name);
#endif
+#endif /* MAKE_KPSE_DLL */
+
#endif /* not KPATHSEA_TRUNCATE_H */
diff --git a/Build/source/texk/kpathsea/xopendir.h b/Build/source/texk/kpathsea/xopendir.h
index 30988d90951..aceebffaa40 100644
--- a/Build/source/texk/kpathsea/xopendir.h
+++ b/Build/source/texk/kpathsea/xopendir.h
@@ -1,6 +1,6 @@
/* xopendir.h: declare checked directory operations.
- Copyright 1994, 1996, 2008 Karl Berry.
+ Copyright 1994, 1996, 2008, 2010 Karl Berry.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -22,8 +22,12 @@
#include <kpathsea/c-proto.h>
#include <kpathsea/types.h>
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
+
/* Like opendir and closedir, but abort on error. */
extern DIR *xopendir (string dirname);
extern void xclosedir (DIR *);
+#endif /* MAKE_KPSE_DLL */
+
#endif /* not (KPATHSEA_XOPENDIR_H or WIN32) */
diff --git a/Build/source/texk/kpathsea/xstat.h b/Build/source/texk/kpathsea/xstat.h
index c256687b4ba..37eb65f91fe 100644
--- a/Build/source/texk/kpathsea/xstat.h
+++ b/Build/source/texk/kpathsea/xstat.h
@@ -1,6 +1,6 @@
/* xstat.h: stat with error checking.
- Copyright 1992, 1993, 1994, 2008 Karl Berry.
+ Copyright 1992, 1993, 1994, 2008, 2010 Karl Berry.
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -28,6 +28,8 @@
#define SAME_FILE_P(s1, s2) \
((s1).st_ino == (s2).st_ino && (s1).st_dev == (s2).st_dev)
+#ifdef MAKE_KPSE_DLL /* libkpathsea internal only */
+
/* Does stat(2) on PATH, and aborts if the stat fails. */
extern struct stat xstat (const_string path);
@@ -38,4 +40,6 @@ extern struct stat xlstat (const_string path);
#define xlstat xstat
#endif
+#endif /* MAKE_KPSE_DLL */
+
#endif /* not KPATHSEA_XSTAT_H */