diff options
| author | Paul Eggert | 2011-07-04 22:27:49 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-04 22:27:49 -0700 |
| commit | 9cfdb3ec08672f13088ebd133bbc794c04a66b05 (patch) | |
| tree | 0e0b851de11b990831c7a0fc39ff97f00edfad93 /lib-src | |
| parent | 6089c5670b18a02fc2caca3e665d2bb7799dc4c8 (diff) | |
| download | emacs-9cfdb3ec08672f13088ebd133bbc794c04a66b05.tar.gz emacs-9cfdb3ec08672f13088ebd133bbc794c04a66b05.zip | |
[ChangeLog]
Assume support for memcmp, memcpy, memmove, memset.
This simplifies the code a bit. All current platforms have these,
as they are required for C89. If this turns into a problem we
can add the gnulib modules for these (a 1-line change to Makefile.in).
* configure.in: Don't check for memcmp, memcpy, memmove, memset.
[lib-src/ChangeLog]
Assume support for memcmp, memcpy, memmove, memset.
* etags.c (absolute_filename): Assume memmove exists.
[src/ChangeLog]
Assume support for memcmp, memcpy, memmove, memset.
* lisp.h, sysdep.c (memcmp, memcpy, memmove, memset):
* regex.c (memcmp, memcpy):
Remove; we assume C89 now.
* gmalloc.c (memcpy, memset, memmove): Remove; we assume C89 now.
(__malloc_safe_bcopy): Remove; no longer needed.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/etags.c | 9 |
2 files changed, 5 insertions, 9 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 098ee06c762..c2b1b106c15 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-07-05 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Assume support for memcmp, memcpy, memmove, memset. | ||
| 4 | * etags.c (absolute_filename): Assume memmove exists. | ||
| 5 | |||
| 1 | 2011-07-02 Jason Rumney <jasonr@gnu.org> | 6 | 2011-07-02 Jason Rumney <jasonr@gnu.org> |
| 2 | 7 | ||
| 3 | * emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on | 8 | * emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on |
diff --git a/lib-src/etags.c b/lib-src/etags.c index 693c999047f..bba4b8e7267 100644 --- a/lib-src/etags.c +++ b/lib-src/etags.c | |||
| @@ -6567,22 +6567,13 @@ absolute_filename (char *file, char *dir) | |||
| 6567 | else if (cp[0] != '/') | 6567 | else if (cp[0] != '/') |
| 6568 | cp = slashp; | 6568 | cp = slashp; |
| 6569 | #endif | 6569 | #endif |
| 6570 | #ifdef HAVE_MEMMOVE | ||
| 6571 | memmove (cp, slashp + 3, strlen (slashp + 2)); | 6570 | memmove (cp, slashp + 3, strlen (slashp + 2)); |
| 6572 | #else | ||
| 6573 | /* Overlapping copy isn't really okay */ | ||
| 6574 | strcpy (cp, slashp + 3); | ||
| 6575 | #endif | ||
| 6576 | slashp = cp; | 6571 | slashp = cp; |
| 6577 | continue; | 6572 | continue; |
| 6578 | } | 6573 | } |
| 6579 | else if (slashp[2] == '/' || slashp[2] == '\0') | 6574 | else if (slashp[2] == '/' || slashp[2] == '\0') |
| 6580 | { | 6575 | { |
| 6581 | #ifdef HAVE_MEMMOVE | ||
| 6582 | memmove (slashp, slashp + 2, strlen (slashp + 1)); | 6576 | memmove (slashp, slashp + 2, strlen (slashp + 1)); |
| 6583 | #else | ||
| 6584 | strcpy (slashp, slashp + 2); | ||
| 6585 | #endif | ||
| 6586 | continue; | 6577 | continue; |
| 6587 | } | 6578 | } |
| 6588 | } | 6579 | } |