- C++'ified everything so that the file is no longer dependent on
  non-standard GNU C extensions