summaryrefslogtreecommitdiff
path: root/msdos
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2010-07-11 12:31:10 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2010-07-11 12:31:10 +0200
commit8966b7575b1adf62101df4f2ba8ce7f59f893397 (patch)
treeedf79c21229574aa60525071acbfbd50aac9ff4b /msdos
parentcf237e277f6b033fd8d47ecdc466722c73de5d96 (diff)
downloademacs-8966b7575b1adf62101df4f2ba8ce7f59f893397.tar.gz
Use strchr, strrchr instead of index, rindex
* callint.c (Fcall_interactively): Use strchr, strrchr instead of index, rindex. * doc.c (get_doc_string, Fsnarf_documentation): Likewise. * editfns.c (Fuser_full_name, Fformat): Likewise. * emacs.c (argmatch, sort_args, decode_env_path): Likewise. * fileio.c (Ffile_symlink_p): Likewise. * filelock.c (current_lock_owner): Likewise. * font.c (font_parse_name, font_parse_family_registry): Likewise. * fontset.c (fontset_pattern_regexp): Likewise. * lread.c (read1): Likewise. * sysdep.c (init_system_name): Likewise. * xfns.c (select_visual): Likewise. * s/hpux10-20.h (index, rindex): Don't define. * s/ms-w32.h (index): Likewise. * s/usg5-4.h: Likewise. * sed2v2.inp (HAVE_INDEX, HAVE_RINDEX): Don't edit. (HAVE_STRCHR, HAVE_STRRCHR): Edit to 1. * emacsclient.c (set_local_socket): Use strchr, strrchr instead of index, rindex. * movemail.c (mail_spool_name, popmail): Likewise. * pop.c (pop_list): Likewise. * CPP-DEFINES (HAVE_INDEX, HAVE_RINDEX): Remove. * configure.in: Don't check for index and rindex, check for strchr and strrchr. Define strchr and strrchr as index and rindex, resp., in src/config.h if not available.
Diffstat (limited to 'msdos')
-rw-r--r--msdos/ChangeLog5
-rw-r--r--msdos/sed2v2.inp4
2 files changed, 7 insertions, 2 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 658ea8146c7..3c4d15999b5 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2010-07-11 Andreas Schwab <schwab@linux-m68k.org>
+
+ * sed2v2.inp (HAVE_INDEX, HAVE_RINDEX): Don't edit.
+ (HAVE_STRCHR, HAVE_STRRCHR): Edit to 1.
+
2010-07-08 Eli Zaretskii <eliz@gnu.org>
* sed1v2.inp (stamp-oldxmenu): Don't edit out in `temacs:' target,
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index a802202d9c4..e1f007f1bab 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -46,9 +46,9 @@
/^#undef HAVE_TM_GMTOFF *$/s/^.*$/#define HAVE_TM_GMTOFF 1/
/^#undef HAVE_MBLEN *$/s/^.*$/#define HAVE_MBLEN 1/
/^#undef HAVE_STRUCT_TIMEZONE *$/s/^.*$/#define HAVE_STRUCT_TIMEZONE 1/
-/^#undef HAVE_INDEX *$/s/^.*$/#define HAVE_INDEX 1/
+/^#undef HAVE_STRCHR *$/s/^.*$/#define HAVE_STRCHR 1/
/^#undef HAVE_SIZE_T *$/s/^.*$/#define HAVE_SIZE_T 1/
-/^#undef HAVE_RINDEX *$/s/^.*$/#define HAVE_RINDEX 1/
+/^#undef HAVE_STRRCHR *$/s/^.*$/#define HAVE_STRRCHR 1/
/^#undef HAVE_MKSTEMP *$/s/^.*$/#define HAVE_MKSTEMP 1/
/^#undef HAVE_STRUCT_TM_TM_ZONE *$/s/^.*$/#define HAVE_STRUCT_TM_TM_ZONE 1/
/^#undef HAVE_SYNC *$/s/^.*$/#define HAVE_SYNC 1/