#26 cgreen fails to compile under gcc 4.6.3.

[ethanb]

Stricter parameter checking in newer compilers causes compile breakage.
This patch set fixes those items for gcc 4.6.3 (Ubuntu 12.04).

[ethanb]

Compile fixes for gcc 4.6.3

[Matt Hargett]

applied as r542 with some minor modifications. thanks!