top: final cleanup following nls conflict resolutions
This patch represents the final resting place for miscellaneous changes not otherwise encountered or for which the resolution was incomplete or incorrect.
This commit is contained in:
@ -1412,7 +1412,7 @@ static void calibrate_fields (void) {
|
|||||||
f = w->pflgsall[i + w->begpflg];
|
f = w->pflgsall[i + w->begpflg];
|
||||||
w->procflgs[i] = f;
|
w->procflgs[i] = f;
|
||||||
#ifndef USE_X_COLHDR
|
#ifndef USE_X_COLHDR
|
||||||
if (P_MAXPFLGS < f) continue;
|
if (P_MAXPFLGS <= f) continue;
|
||||||
#endif
|
#endif
|
||||||
h = Fieldstab[f].head;
|
h = Fieldstab[f].head;
|
||||||
// oops, won't fit -- we're outta here...
|
// oops, won't fit -- we're outta here...
|
||||||
@ -1463,7 +1463,7 @@ static void calibrate_fields (void) {
|
|||||||
w->hdrcaplen += strlen(Caps_off) + strlen(w->capclr_msg);
|
w->hdrcaplen += strlen(Caps_off) + strlen(w->capclr_msg);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
if (P_MAXPFLGS < f) continue;
|
if (P_MAXPFLGS <= f) continue;
|
||||||
#endif
|
#endif
|
||||||
h = Fieldstab[f].head;
|
h = Fieldstab[f].head;
|
||||||
if (P_WCH == f) needpsdb = 1;
|
if (P_WCH == f) needpsdb = 1;
|
||||||
|
Reference in New Issue
Block a user