extern and EXTERN (have to check later the Windows compatibility)
Merge branch 'master' of https://github.com/CICM/CicmWrapper

Conflicts:
	Sources/ecommon/g_canvas.h
	Sources/ecommon/m_pd.h