|
I don't think the differences warranted having to maintain 3 slightly
differing copies. "Old" locations changed to a forwarding header to the
merged one.
Differences and how they were resolved in the merged file:
- comment on a workaround for a potential issue when using g++
=> comment kept
- #ifdef's for xlc-64 had been simplified, because it is only supported
on AIX 4.3 and above
=> versioned #ifdefs should still work on 64-bit platforms, so that
was preferred; comment left for future reference
- use of different condition in #if clause: (_XOPEN_SOURCE-0 >= 500)
=> verbosity preferred, since it is probably a workaround for a
preprocessor or #define bug.
Reviewed-by: Thiago Macieira
|