pajoye Thu, 20 Jan 2011 06:49:17 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=307614
Log:
- kill local redeclaration
Changed paths:
U php/php-src/branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c
U php/php-src/trunk/ext/com_dotnet/com_typeinfo.c
Modified: php/php-src/branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c 2011-01-20
06:45:52 UTC (rev 307613)
+++ php/php-src/branches/PHP_5_3/ext/com_dotnet/com_typeinfo.c 2011-01-20
06:49:17 UTC (rev 307614)
@@ -120,14 +120,14 @@
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);
Modified: php/php-src/trunk/ext/com_dotnet/com_typeinfo.c
===================================================================
--- php/php-src/trunk/ext/com_dotnet/com_typeinfo.c 2011-01-20 06:45:52 UTC
(rev 307613)
+++ php/php-src/trunk/ext/com_dotnet/com_typeinfo.c 2011-01-20 06:49:17 UTC
(rev 307614)
@@ -120,14 +120,14 @@
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);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
