add conditionals around more date-related declarations
add missing space
typedef for uintptr_t