Changeset 4106

Show
Ignore:
Timestamp:
07/14/06 18:21:58 (2 years ago)
Author:
shirai
Message:

[meadow-develop:7371] Sync up Emacs CVS HEAD for VC++.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/ChangeLog.Meadow

    r4105 r4106  
     12006-07-14  Hideyuki SHIRAI  <shirai@meadowy.org> 
     2 
     3        * lisp.h (VALBITS): [MD:7371] Sync up Emacs CVS HEAD for 
     4        VC++. 
     5        (ARRAY_MARK_FLAG): Ditto. 
     6 
    172006-07-12  MIYOSHI Masanori  <miyoshi@meadowy.org> 
    28 

  • trunk/src/lisp.h

    r4098 r4106  
    181181/* These values are overridden by the m- file on some machines.  */ 
    182182#ifndef VALBITS 
    183 #define VALBITS (BITS_PER_EMACS_INT - (GCTYPEBITS + 1)) 
     183#define VALBITS (BITS_PER_EMACS_INT - GCTYPEBITS) 
    184184#endif 
    185185 
    …… 
    264264 
    265265#ifndef ARRAY_MARK_FLAG 
    266 #define ARRAY_MARK_FLAG ((EMACS_INT) ((EMACS_UINT) 1 << (VALBITS + GCTYPEBITS - 2))) 
     266#define ARRAY_MARK_FLAG ((EMACS_INT) ((EMACS_UINT) 1 << (VALBITS + GCTYPEBITS - 1))) 
    267267#endif /* no ARRAY_MARK_FLAG */ 
    268268