Github issue 39: GCC 4.1 portability fixes