The term "witch", at least as it applies to Wicca (which I presume the reference is to), is gender neutral. A male witch is a witch, not a "warlock".
The language confusion problem probably dates from the farcical Salem trials, which were largely used to rid the society of aged women and any others they didn't like very much.
Or thought of another way, rather than supporting older unmarried (ie widowed) women, they accused and then burned them as witches. A novel solution to an unfunded pension problem, but not practical.
My trusty Oxford English dictionary says a witch is “ a woman thought to have evil magical powers “ . A warlock is a “ man who practices witchcraft. “