Change define to typedef