more type/specifier and macro fixing
more type/specifier and macro fixing

git-svn-id: b004b0f09f6cae579026b9f822d5a9f57666323a@11120 3eda493b-6a19-0410-b2e0-ec8ea4dd8fda

pscedu/slash2-stable,pscedu/slash2-stable,pscedu/slash2-stable,pscedu/slash2-stable,pscedu/slash2-stable,pscedu/slash2-stable,pscedu/slash2-stable