modified:   macros_c/regex.def
	modified:   macros_util/tool_output.def
	modified:   macros_win32/views.def
	modified:   output_general.def
Merge branch 'master' of github.com:hzhou/MyDef
	modified:   macros_c/cfunctions.def
	modified:   mydef_make.def
Merge branch 'master' of github.com:hzhou/MyDef

Conflicts:
	macros_c/cfunctions.def
	mydef_make.def
	output_general.def
Merge branch 'master' of github.com:hzhou/MyDef
Merge branch 'master' of github.com:hzhou/MyDef
Fixing handle_callback_block