http://x.cybermirror.org/R5contrib/xscreensaver-1.21.tar.Z

[xscreensaver] / hacks / screenhack.c

diff --git a/hacks/screenhack.c b/hacks/screenhack.c
index 0bbd4be20c5d66391484fa5aac0c2a79f0f699b0..12802ffae5828c4f4b1f1a622e99e62ff72efefe 100644 (file)
--- a/hacks/screenhack.c
+++ b/hacks/screenhack.c
@@ -70,17 +70,17 @@ merge_options ()
   merged_options_size = XtNumber (default_options) + options_size;
   merged_options = (XrmOptionDescRec *)
     malloc (sizeof (default_options) + options_sizeof);
-  bcopy (options, merged_options, options_sizeof);
-  bcopy (default_options, merged_options + options_size,
-        sizeof (default_options));
+  memcpy (merged_options, options, options_sizeof);
+  memcpy (merged_options + options_size, default_options,
+         sizeof (default_options));
 
   for (defaults_size = 0; defaults [defaults_size]; defaults_size++);
   merged_defaults = (char **)
     malloc (sizeof (default_defaults) + (defaults_size * sizeof (char *)));
-  bcopy (default_defaults, merged_defaults, sizeof (default_defaults));
-  bcopy (defaults, merged_defaults - 1 +
-        (sizeof (default_defaults) / sizeof (default_defaults[0])),
-        ((defaults_size + 1) * sizeof (defaults[0])));
+  memcpy (merged_defaults, default_defaults, sizeof (default_defaults));
+  memcpy ((merged_defaults - 1 +
+          (sizeof (default_defaults) / sizeof (default_defaults[0]))),
+         defaults, ((defaults_size + 1) * sizeof (defaults[0])));
 }
 
 \f