Avoid trivial "don't mix declarations and code" compiler warning
Help decrease conflicts between SVN trunk and Cisco git branch of OMPI v1.6 branch