include/main/php.h

    Add ACE define checks to prevent redefinition of uid_t and gid_t

include/win32/ipc.h

    Add ACE define check to prevent redefinition of key_t