Fix some warnings in some unusual #ifdef combinations

Bug #101812
2 files changed