From dictionary.com

witch -
# A woman claiming or popularly believed to possess magical powers and practice sorcery.
warlock -
A male witch, sorcerer, wizard, or demon.
There, just to get this back on track instead of arguing the semantics of the word.