| version 1.134 | | version 1.135 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_object_c = | | * static char *rcsid_object_c = |
| * "$Id: object.c,v 1.134 2006/07/02 15:32:34 tchize Exp $"; | | * "$Id: object.c,v 1.135 2006/07/04 21:22:24 ryo_saeba Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| SET_FLAG(ob2, FLAG_BEEN_APPLIED); | | SET_FLAG(ob2, FLAG_BEEN_APPLIED); |
| | | |
| | | |
| | | /* Note: FLAG_INV_LOCKED is ignored for merging purposes */ |
| if ((ob1->arch != ob2->arch) || | | if ((ob1->arch != ob2->arch) || |
| (ob1->flags[0] != ob2->flags[0]) || | | (ob1->flags[0] != ob2->flags[0]) || |
| (ob1->flags[1] != ob2->flags[1]) || | | (ob1->flags[1] != ob2->flags[1]) || |
| ((ob1->flags[2] & ~( 1 << ( FLAG_INV_LOCKED % 32 ) )) != (ob2->flags[2] & ~ ( 1 << ( FLAG_INV_LOCKED % 32 )))) || | | (ob1->flags[2] != ob2->flags[2]) || |
| ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || /* ignore CLIENT_SENT */ | | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || /* ignore CLIENT_SENT */ |
| (ob1->name != ob2->name) || | | (ob1->name != ob2->name) || |
| (ob1->title != ob2->title) || | | (ob1->title != ob2->title) || |