According to Wikipedia, "witch" can be either male or female. So a male witch is just called "witch".
http://en.wikipedia.org/wiki/Witchcraft

Also:
Quote Originally Posted by Wikipedia
"Warlock" is sometimes mistakenly used for male witch.