mirror of
https://github.com/php/php-src.git
synced 2025-01-26 13:44:22 +08:00
- kill local redeclaration
This commit is contained in:
parent
17c1ba460d
commit
ed5594f135
@ -120,14 +120,14 @@ PHPAPI ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_D
|
||||
if (ERROR_SUCCESS == RegQueryValue(hsubkey, version, libname, &libnamelen)) {
|
||||
if (0 == stricmp(libname, search_string)) {
|
||||
char *str = NULL;
|
||||
int major, minor;
|
||||
int major_tmp, minor_tmp;
|
||||
|
||||
/* fetch the GUID and add the version numbers */
|
||||
if (2 != sscanf(version, "%d.%d", &major, &minor)) {
|
||||
major = 1;
|
||||
minor = 0;
|
||||
if (2 != sscanf(version, "%d.%d", &major_tmp, &minor_tmp)) {
|
||||
major_tmp = 1;
|
||||
minor_tmp = 0;
|
||||
}
|
||||
spprintf(&str, 0, "%s,%d,%d", keyname, major, minor);
|
||||
spprintf(&str, 0, "%s,%d,%d", keyname, major_tmp, minor_tmp);
|
||||
/* recurse */
|
||||
TL = php_com_load_typelib(str, codepage TSRMLS_CC);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user