merge trunk

[gnu-emacs] / src / dosfns.c

diff --git a/src/dosfns.c b/src/dosfns.c
index 3b9b2dbc03815dba501b2bf822676dec60b82ea4..8ef672fb8bb390fd2a3d7c32ef092aea90378e96 100644 (file)
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -1,6 +1,6 @@
 /* MS-DOS specific Lisp utilities.  Coded by Manabu Higashida, 1991.
    Major changes May-July 1993 Morten Welinder (only 10% original code left)
-   Copyright (C) 1991, 1993, 1996-1998, 2001-2011 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 1996-1998, 2001-2012 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -62,7 +62,7 @@ REGISTERS should be a vector produced by `make-register' and
   CHECK_NUMBER (interrupt);
   no = (unsigned long) XINT (interrupt);
   CHECK_VECTOR (registers);
-  if (no < 0 || no > 0xff || XVECTOR (registers)-> size != 8)
+  if (no < 0 || no > 0xff || ASIZE (registers) != 8)
     return Qnil;
   for (i = 0; i < 8; i++)
     CHECK_NUMBER (XVECTOR (registers)->contents[i]);
@@ -102,7 +102,7 @@ Return the updated VECTOR.  */)
   CHECK_NUMBER (address);
   offs = (unsigned long) XINT (address);
   CHECK_VECTOR (vector);
-  len = XVECTOR (vector)-> size;
+  len = ASIZE (vector);
   if (len < 1 || len > 2048 || offs < 0 || offs > 0xfffff - len)
     return Qnil;
   buf = alloca (len);
@@ -125,7 +125,7 @@ DEFUN ("msdos-memput", Fdos_memput, Sdos_memput, 2, 2, 0,
   CHECK_NUMBER (address);
   offs = (unsigned long) XINT (address);
   CHECK_VECTOR (vector);
-  len = XVECTOR (vector)-> size;
+  len = ASIZE (vector);
   if (len < 1 || len > 2048 || offs < 0 || offs > 0xfffff - len)
     return Qnil;
   buf = alloca (len);
@@ -343,13 +343,13 @@ init_dosfns (void)
        {
          dpmiregs.x.ax = 0x168e;
          dpmiregs.x.dx = 3;    /* get VM title */
-         dpmiregs.x.cx = sizeof(parent_vm_title) - 1;
+         dpmiregs.x.cx = sizeof (parent_vm_title) - 1;
          dpmiregs.x.es = __tb >> 4;
          dpmiregs.x.di = __tb & 15;
          dpmiregs.x.sp = dpmiregs.x.ss = dpmiregs.x.flags = 0;
          _go32_dpmi_simulate_int (0x2f, &dpmiregs);
          if (dpmiregs.x.ax == 1)
-           dosmemget (__tb, sizeof(parent_vm_title), parent_vm_title);
+           dosmemget (__tb, sizeof (parent_vm_title), parent_vm_title);
        }
     }
   else
@@ -573,7 +573,7 @@ system_process_attributes (Lisp_Object pid)
                            Fsymbol_value (intern ("before-init-time"))),
                     attrs);
       attrs = Fcons (Fcons (Qvsize,
-                           make_fixnum_or_float ((unsigned long)sbrk(0)/1024)),
+                           make_fixnum_or_float ((unsigned long)sbrk (0)/1024)),
                     attrs);
       attrs = Fcons (Fcons (Qetime, tem), attrs);
 #ifndef SYSTEM_MALLOC