@@ -38,11 +38,11 @@
 	if (!SetEvent(condition->event)) {
 		switch (GetLastError()) {
 		case ERROR_INVALID_HANDLE:
 			return EINVAL;
 		default:
-			OF_ENSURE(0);
+			OFEnsure(0);
 		}
 	}
 
 	return 0;
 }
@@ -56,11 +56,11 @@
 		if (!SetEvent(condition->event)) {
 			switch (GetLastError()) {
 			case ERROR_INVALID_HANDLE:
 				return EINVAL;
 			default:
-				OF_ENSURE(0);
+				OFEnsure(0);
 			}
 		}
 	}
 
 	return 0;
@@ -85,14 +85,14 @@
 	case WAIT_FAILED:
 		switch (GetLastError()) {
 		case ERROR_INVALID_HANDLE:
 			return EINVAL;
 		default:
-			OF_ENSURE(0);
+			OFEnsure(0);
 		}
 	default:
-		OF_ENSURE(0);
+		OFEnsure(0);
 	}
 }
 
 int
 OFPlainConditionTimedWait(OFPlainCondition *condition, OFPlainMutex *mutex,
@@ -116,14 +116,14 @@
 	case WAIT_FAILED:
 		switch (GetLastError()) {
 		case ERROR_INVALID_HANDLE:
 			return EINVAL;
 		default:
-			OF_ENSURE(0);
+			OFEnsure(0);
 		}
 	default:
-		OF_ENSURE(0);
+		OFEnsure(0);
 	}
 }
 
 int
 OFPlainConditionFree(OFPlainCondition *condition)