When trying to compile sapi/cgi/getopt.c and sapi/cgi/cgi_main.c, I get the following errors:

---------- begin [getopt..c] ----------
ERROR :15    The redeclaration cannot specify a different storage class.
ERROR :16    The redeclaration cannot specify a different storage class.
---------- end   [getopt.c] ----------

I got rid of above error by removing static from 
     static int ap_php_opterr = 1;
     static int ap_php_optopt;


---------- begin [cgi_main.c] ----------
ERROR :204   The redeclaration cannot specify a different storage class.
---------- end   [cgi_main.c] ----------

I got rid of above error by removing static from 
     static sapi_module_struct sapi_module = {


I believe the errors are due to the conflicting declarations in sapi/cgi/php_getopt.h:

extern int ap_php_opterr;
extern int ap_php_optopt;

and the conflictng declaration in main/SAPI.h:

extern sapi_module_struct sapi_module;