Some macro changes
Merge branch 'macro-changes-gcc'

Conflicts:
	Sources/Macroses.h