Change strrchr() to my_strrchr() to allow for use when there IS a strrchr().

diff --git a/src/curses/ux_frotz.h b/src/curses/ux_frotz.h
index 1e87b3fce380a4daea14cf298c5a49ea58ecb447..f26c17119eb0a66ac0248c55e5a3eee2812b18cc 100644 (file)
--- a/src/curses/ux_frotz.h
+++ b/src/curses/ux_frotz.h
@@ -96,7 +96,8 @@ void unix_get_terminal_size(void);      /* ux_init.c */
 
 
 #ifdef NO_STRRCHR
-char *strrchr(const char *, int);
+char *my_strrchr(const char *, int);
+#define strrchr my_strrchr
 #endif
 
 #endif /* UX_FROTZ_H */

diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c
index 0b59d387064e2d022ca44ee32330bfc0d76d1ef6..5b0f958f20c7fd5e777d2e96b4e171d5c03b1b8b 100644 (file)
--- a/src/curses/ux_init.c
+++ b/src/curses/ux_init.c
@@ -1079,7 +1079,7 @@ void os_init_setup(void)
  * This is for operating systems that lack strrchr(3).
  *
  */
-char *strrchr(const char *s, int c)
+char *my_strrchr(const char *s, int c)
 {
     const char *save;