com php-src: correct macro names: sapi/cli/php_cli.c win 32/codepage.h

Commit: 2349332b664887474ed2fb09dcdc4c57d8bb2b85 Author: Anatol Belski <ab@php.net> Sun, 17 Jul 2016 12:18:23 +0200 Parents: 735bec4f4018a4009a37d96489afe941c1ad711a Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2349332b664887474ed2fb09dcdc4c57d8bb2b85 Log: correct macro names Changed paths: M sapi/cli/php_cli.c M win32/codepage.h Diff: diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index c3e2211..dc92045 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -1360,7 +1360,7 @@ exit_loop: might be too late though, but this is the earliest place ATW we can access the internal charset information from PHP. */ argv_wide = CommandLineToArgvW(GetCommandLineW(), &num_args); - PHP_WIN32_CP_W_TO_A_ARRAY(argv_wide, num_args, argv, argc) + PHP_WIN32_CP_W_TO_ANY_ARRAY(argv_wide, num_args, argv, argc) using_wide_argv = 1; SetConsoleCtrlHandler(php_cli_win32_ctrl_handler, TRUE); @@ -1403,7 +1403,7 @@ out: (void)php_win32_cp_cli_restore(); if (using_wide_argv) { - PHP_WIN32_FREE_ARRAY(argv, argc); + PHP_WIN32_CP_FREE_ARRAY(argv, argc); LocalFree(argv_wide); } argv = argv_save; diff --git a/win32/codepage.h b/win32/codepage.h index 4ea2824..96afd44 100644 --- a/win32/codepage.h +++ b/win32/codepage.h @@ -125,7 +125,7 @@ __forceinline static char *php_win32_cp_conv_w_to_any(const wchar_t* in, size_t }/*}}}*/ #define php_win32_cp_w_to_any(in) php_win32_cp_conv_w_to_any(in, PHP_WIN32_CP_IGNORE_LEN, PHP_WIN32_CP_IGNORE_LEN_P) -#define PHP_WIN32_CP_W_TO_A_ARRAY(aw, aw_len, aa, aa_len) do { \ +#define PHP_WIN32_CP_W_TO_ANY_ARRAY(aw, aw_len, aa, aa_len) do { \ int i; \ aa_len = aw_len; \ aa = (char **) malloc(aw_len * sizeof(char *)); \ @@ -138,7 +138,7 @@ __forceinline static char *php_win32_cp_conv_w_to_any(const wchar_t* in, size_t } while (0); -#define PHP_WIN32_FREE_ARRAY(a, a_len) do { \ +#define PHP_WIN32_CP_FREE_ARRAY(a, a_len) do { \ int i; \ for (i = 0; i < a_len; i++) { \ free(a[i]); \