Changeset 2ac2935 in git for Singular/links/ndbm.cc


Ignore:
Timestamp:
Dec 7, 2012, 3:41:00 PM (11 years ago)
Author:
Alexander Dreyer <adreyer@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
ec1006cbd9971c4271d05aefada775ef29d762a6
Parents:
7e18d198148353f88708cfa20f738ac338cb1f556554ca42ebe1277c9afe7990970390905a6e1cf0
Message:
Merge conflict resolved
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Singular/links/ndbm.cc

    r7e18d1 r2ac2935  
    291291#endif
    292292    }
    293     if (((short *)db->dbm_pagbuf)[0] != 0)
     293    short tmp;
     294    memcpy(&tmp, db->dbm_pagbuf, sizeof(short));
     295    if (tmp != 0)
    294296    {
    295297      item = makdatum(db->dbm_pagbuf, db->dbm_keyptr);
Note: See TracChangeset for help on using the changeset viewer.