udated INT64_C/UINT64_C things for c++
updating INT64_C/UINT64_C to work reliably with c++
merging changes