[fix] マクロの再定義の修正　値を返さない関数の修正　using namespaceの削除

This reverts commit 1d0c0039d49db1270cd32ea301117fc0ba5c8d13.
Merge branch 'master' of https://github.com/pspt1982/drawps