Merge windows code.

Signed-off-by: Sean Ogden <positivelyskewed.sf@gmail.com>
added ifdefs in headers.

Signed-off-by: Sean Ogden <positivelyskewed.sf@gmail.com>
windows merge fixes.

Signed-off-by: Sean Ogden <positivelyskewed.sf@gmail.com>
Merge branch 'windows' of git://github.com/seanogden/po6

* 'windows' of git://github.com/seanogden/po6:
  windows merge fixes.
  added ifdefs in headers.
  Merge windows code.