kill c99 comments, aix does not like them (Jean-Louis CHARTON)
try to fix memcpy (Jean-Louis CHARTON)
Fix wrong ifdef configure test (Jean-Louis CHARTON)
Merge remote-tracking branch 'upstream/master'