Use proper type declarations for brand_type.

Conflicts:
	crawl-ref/source/itemprop.cc