summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2010-09-04 10:23:09 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2010-09-04 10:23:09 +0200
commitdbfe4532cba587de47d8c20348a2c01d7b801dad (patch)
tree98beb8aff29a5dcb040fed4f881244fdab7e9fe9
parentdd0c613c9ff9395e9830f53e22e3bc600f3de3a6 (diff)
downloademacs-dbfe4532cba587de47d8c20348a2c01d7b801dad.tar.gz
emacs-dbfe4532cba587de47d8c20348a2c01d7b801dad.tar.bz2
emacs-dbfe4532cba587de47d8c20348a2c01d7b801dad.zip
* image.c (imagemagick_image_p): Replace bcopy by memcpy.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/image.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c70db2ad69a..ce5e139f49c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-04 Andreas Schwab <schwab@linux-m68k.org>
+
+ * image.c (imagemagick_image_p): Replace bcopy by memcpy.
+
2010-09-02 Jan Djärv <jan.h.d@swipnet.se>
* xterm.h (struct dpyinfo): Remove cut_buffers_initialized.
diff --git a/src/image.c b/src/image.c
index ae4bf2fd937..e6e1605b024 100644
--- a/src/image.c
+++ b/src/image.c
@@ -7413,7 +7413,7 @@ static int
imagemagick_image_p (Lisp_Object object)
{
struct image_keyword fmt[IMAGEMAGICK_LAST];
- bcopy (imagemagick_format, fmt, sizeof fmt);
+ memcpy (fmt, imagemagick_format, sizeof fmt);
if (!parse_image_spec (object, fmt, IMAGEMAGICK_LAST, Qimagemagick))
return 0;