additional windows fixes for line and builtin_expect