s/tilde_expand/my_tilde_expand/g to avoid naming conflicts with the

same function in the readline library.

5 files changed, 87 insertions, 0 deletions

diff --git a/math/pspp/files/patch-ac b/math/pspp/files/patch-ac
new file mode 100644
index 000000000000..2de9a814dac4
--- /dev/null
+++ b/math/pspp/files/patch-ac
@@ -0,0 +1,43 @@
+--- src/filename.c.orig	Sat May 27 18:56:28 2000
++++ src/filename.c	Sat May 27 18:59:02 2000
+@@ -213,7 +213,7 @@
+ /* Expands csh tilde notation from the path INPUT into a malloc()'d
+    returned string. */
+ char *
+-tilde_expand (const char *input)
++my_tilde_expand (const char *input)
+ {
+   char *output, *end;
+   const char *ip;
+@@ -288,7 +288,7 @@
+ }
+ #else /* !unix */
+ char *
+-tilde_expand (char *input)
++my_tilde_expand (char *input)
+ {
+   return xstrdup (input);
+ }
+@@ -340,7 +340,7 @@
+   if (is_special_filename (filename))
+     return xstrdup (filename);
+   
+-  fn1 = tilde_expand (filename);
++  fn1 = my_tilde_expand (filename);
+ 
+   /* Follow symbolic links. */
+   while (1)
+@@ -585,11 +585,11 @@
+     boilerplate_len += 1 + strlen (prepend);
+ 
+   if (absolute_filename_p (name))
+-    return tilde_expand (name);
++    return my_tilde_expand (name);
+   
+   {
+     char *temp = interp_vars (path, blp_getenv);
+-    bp = subst_path = tilde_expand (temp);
++    bp = subst_path = my_tilde_expand (temp);
+     free (temp);
+   }
+ 
diff --git a/math/pspp/files/patch-ad b/math/pspp/files/patch-ad
new file mode 100644
index 000000000000..df29111f8707
--- /dev/null
+++ b/math/pspp/files/patch-ad
@@ -0,0 +1,11 @@
+--- src/filename.h.orig	Sat May 27 18:55:01 2000
++++ src/filename.h	Sat May 27 18:56:43 2000
+@@ -31,7 +31,7 @@
+ const char *getenv_default (const char *key, const char *def);
+ char *interp_vars (const char *, const char *(*)(const char *));
+ 
+-char *tilde_expand (const char *);
++char *my_tilde_expand (const char *);
+ char *search_path (const char *name, const char *path, const char *prepend);
+ 
+ char *gnu_getcwd (void);
diff --git a/math/pspp/files/patch-ae b/math/pspp/files/patch-ae
new file mode 100644
index 000000000000..544f1d906044
--- /dev/null
+++ b/math/pspp/files/patch-ae
@@ -0,0 +1,11 @@
+--- src/getline.c.orig	Sat May 27 18:57:13 2000
++++ src/getline.c	Sat May 27 18:57:18 2000
+@@ -384,7 +384,7 @@
+   if (!history_file)
+     {
+ #if unix
+-      history_file = tilde_expand (HISTORY_FILE);
++      history_file = my_tilde_expand (HISTORY_FILE);
+ #endif
+       using_history ();
+       read_history (history_file);
diff --git a/math/pspp/files/patch-af b/math/pspp/files/patch-af
new file mode 100644
index 000000000000..d2c7453bf2a2
--- /dev/null
+++ b/math/pspp/files/patch-af
@@ -0,0 +1,11 @@
+--- src/groff-font.c.orig	Sat May 27 18:57:34 2000
++++ src/groff-font.c	Sat May 27 18:57:45 2000
+@@ -100,7 +100,7 @@
+   int prev_index = -1;
+ 
+ #if unix
+-  fn = tilde_expand (fn);
++  fn = my_tilde_expand (fn);
+ #endif
+ 
+   verbose_msg (1, _("%s: Opening Groff font file..."), fn);
diff --git a/math/pspp/files/patch-ag b/math/pspp/files/patch-ag
new file mode 100644
index 000000000000..ce61c6526b75
--- /dev/null
+++ b/math/pspp/files/patch-ag
@@ -0,0 +1,11 @@
+--- src/postscript.c.orig	Sat May 27 18:57:57 2000
++++ src/postscript.c	Sat May 27 18:58:10 2000
+@@ -864,7 +864,7 @@
+       pre_pathname = getenv ("GROFF_FONT_PATH");
+     if (pre_pathname == NULL)
+       pre_pathname = groff_font_path;
+-    pathname = tilde_expand (pre_pathname);
++    pathname = my_tilde_expand (pre_pathname);
+   }
+ 
+   /* Search all possible places for the file. */