msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the same in-line.

[gnu-emacs] / src / w32xfns.c

diff --git a/src/w32xfns.c b/src/w32xfns.c
index f57903dc68c60791c121207c0772f434262f1be7..4cbd812ec0f239cb7b9637814aaa8528a2e82946 100644 (file)
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -178,7 +178,7 @@ get_next_msg (W32Msg * lpmsg, BOOL bWait)
 
   if (nQueue)
     {
-      bcopy (&(lpHead->w32msg), lpmsg, sizeof (W32Msg));
+      memcpy (lpmsg, &lpHead->w32msg, sizeof (W32Msg));
 
       {
        int_msg * lpCur = lpHead;
@@ -250,7 +250,7 @@ post_msg (W32Msg * lpmsg)
   if (!lpNew)
     return (FALSE);
 
-  bcopy (lpmsg, &(lpNew->w32msg), sizeof (W32Msg));
+  memcpy (&lpNew->w32msg, lpmsg, sizeof (W32Msg));
   lpNew->lpNext = NULL;
 
   enter_crit ();
@@ -280,7 +280,7 @@ prepend_msg (W32Msg *lpmsg)
   if (!lpNew)
     return (FALSE);
 
-  bcopy (lpmsg, &(lpNew->w32msg), sizeof (W32Msg));
+  memcpy (&lpNew->w32msg, lpmsg, sizeof (W32Msg));
 
   enter_crit ();
 
@@ -408,7 +408,6 @@ XParseGeometry (char *string,
                return (0);
              strind = nextCharacter;
              mask |= YNegative;
-
            }
          else
            {
@@ -422,7 +421,7 @@ XParseGeometry (char *string,
        }
     }
 
-  /* If strind isn't at the end of the string the it's an invalid
+  /* If strind isn't at the end of the string then it's an invalid
      geometry specification. */
 
   if (*strind != '\0') return (0);