diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/odbc/php_odbc.c | 2 | ||||
| -rw-r--r-- | ext/standard/basic_functions.c | 2 | ||||
| -rw-r--r-- | ext/standard/info.c | 12 | ||||
| -rw-r--r-- | ext/standard/info.h | 5 |
4 files changed, 20 insertions, 1 deletions
diff --git a/ext/odbc/php_odbc.c b/ext/odbc/php_odbc.c index 29fa4724a3..b5e3165a4e 100644 --- a/ext/odbc/php_odbc.c +++ b/ext/odbc/php_odbc.c @@ -465,7 +465,7 @@ void ODBC_SQL_ERROR(HENV henv, HDBC conn, HSTMT stmt, char *func) ODBCLS_FETCH(); do { - SQLError(henv, conn, stmt, state, + ret = SQLError(henv, conn, stmt, state, &error, errormsg, sizeof(errormsg)-1, &errormsgsize); if (func) { php_error(E_WARNING, "SQL error: %s, SQL state %s in %s", diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 981de17212..a9246e8fc2 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -113,6 +113,8 @@ function_entry basic_functions[] = { PHP_FE(phpinfo, NULL) PHP_FE(phpversion, NULL) PHP_FE(phpcredits, NULL) + PHP_FE(php_logo_guid, NULL) + PHP_FE(zend_logo_guid, NULL) PHP_FE(strspn, NULL) PHP_FE(strcspn, NULL) diff --git a/ext/standard/info.c b/ext/standard/info.c index 69a9d2791c..2933482006 100644 --- a/ext/standard/info.c +++ b/ext/standard/info.c @@ -510,6 +510,18 @@ PHP_FUNCTION(phpcredits) /* }}} */ + +PHP_FUNCTION(php_logo_guid) +{ + RETURN_STRINGL(PHP_LOGO_GUID, sizeof(PHP_LOGO_GUID)-1, 1); +} + + +PHP_FUNCTION(zend_logo_guid) +{ + RETURN_STRINGL(ZEND_LOGO_GUID, sizeof(ZEND_LOGO_GUID)-1, 1); +} + /* * Local variables: * tab-width: 4 diff --git a/ext/standard/info.h b/ext/standard/info.h index 627accf213..72aadf72ee 100644 --- a/ext/standard/info.h +++ b/ext/standard/info.h @@ -52,9 +52,14 @@ #define PHP_CREDITS_FULLPAGE (1<<3) #define PHP_CREDITS_ALL 0xFFFFFFFF +#define PHP_LOGO_GUID "PHPE9568F34-D428-11d2-A769-00AA001ACF42" +#define ZEND_LOGO_GUID "PHPE9568F35-D428-11d2-A769-00AA001ACF42" + PHP_FUNCTION(phpversion); PHP_FUNCTION(phpinfo); PHP_FUNCTION(phpcredits); +PHP_FUNCTION(php_logo_guid); +PHP_FUNCTION(zend_logo_guid); PHPAPI void php_print_info(int flag); PHPAPI void php_print_credits(int flag); |