The preferred word for potentially-funny men and women has, for some time, been comedian. Its feminine counterpart, comedienne, which seems to have developed in English well after comedian, may still occasionally appear, though it is non-standard and unnecessarily gendered.