archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Trailing whitespaces on win32

Browse source 
Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
This commit is contained in:
Gabriel Caruso 2018-01-04 02:41:26 -02:00
parent 471da3eddc
commit c215b8d147
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
win32/codepage.h
View file

@ -84,8 +84,8 @@ __forceinline static wchar_t *php_win32_cp_conv_any_to_w(const char* in, size_t
if (php_win32_cp_use_unicode()) { if (php_win32_cp_use_unicode()) {
/* First try the pure ascii conversion. This is the fastest way to do the /* First try the pure ascii conversion. This is the fastest way to do the
thing. Only applicable if the source string is UTF-8 in general. thing. Only applicable if the source string is UTF-8 in general.
While it could possibly be ok with European encodings, usage with While it could possibly be ok with European encodings, usage with
Asian encodings can cause unintended side effects. Lookup the term Asian encodings can cause unintended side effects. Lookup the term
"mojibake" if need more. */ "mojibake" if need more. */
ret = php_win32_cp_conv_ascii_to_w(in, in_len, out_len); ret = php_win32_cp_conv_ascii_to_w(in, in_len, out_len);
@ -97,7 +97,7 @@ __forceinline static wchar_t *php_win32_cp_conv_any_to_w(const char* in, size_t
/* Still need this fallback with regard to possible broken data /* Still need this fallback with regard to possible broken data
in the existing scripts. Broken data might be hardcoded in in the existing scripts. Broken data might be hardcoded in
the user scripts, as UTF-8 settings was de facto ignored in the user scripts, as UTF-8 settings was de facto ignored in
older PHP versions. The fallback can be removed later for older PHP versions. The fallback can be removed later for
the sake of purity, keep now for BC reasons. */ the sake of purity, keep now for BC reasons. */
if (!ret) { if (!ret) {
const struct php_win32_cp *acp = php_win32_cp_get_by_id(GetACP()); const struct php_win32_cp *acp = php_win32_cp_get_by_id(GetACP());

4
win32/getrusage.h
View file

@ -21,8 +21,8 @@
/* /*
* Note * Note
* *
* RUSAGE_CHILDREN is not implemented, and the RUSAGE_THREAD will * RUSAGE_CHILDREN is not implemented, and the RUSAGE_THREAD will
* therefore instead be used instead to emulate the behavior. * therefore instead be used instead to emulate the behavior.
*/ */

6
win32/ioutil.h
View file

@ -38,7 +38,7 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifndef PHP_WIN32_IOUTIL_H #ifndef PHP_WIN32_IOUTIL_H
#define PHP_WIN32_IOUTIL_H #define PHP_WIN32_IOUTIL_H
@ -166,7 +166,7 @@ typedef enum {
PW32IO php_win32_ioutil_normalization_result php_win32_ioutil_normalize_path_w(wchar_t **buf, size_t len, size_t *new_len); PW32IO php_win32_ioutil_normalization_result php_win32_ioutil_normalize_path_w(wchar_t **buf, size_t len, size_t *new_len);
#ifdef PHP_EXPORTS #ifdef PHP_EXPORTS
/* This symbols are needed only for the DllMain, but should not be exported /* This symbols are needed only for the DllMain, but should not be exported
or be available when used with PHP binaries. */ or be available when used with PHP binaries. */
BOOL php_win32_ioutil_init(void); BOOL php_win32_ioutil_init(void);
#endif #endif
@ -177,7 +177,7 @@ __forceinline static wchar_t *php_win32_ioutil_conv_any_to_w(const char* in, siz
{/*{{{*/ {/*{{{*/
wchar_t *mb, *ret; wchar_t *mb, *ret;
size_t mb_len; size_t mb_len;
mb = php_win32_cp_conv_any_to_w(in, in_len, &mb_len); mb = php_win32_cp_conv_any_to_w(in, in_len, &mb_len);
if (!mb) { if (!mb) {
return NULL; return NULL;

2
win32/time.h
View file

@ -55,7 +55,7 @@ PHPAPI int nanosleep( const struct timespec * rqtp, struct timespec * rmtp );
PHPAPI int usleep(unsigned int useconds); PHPAPI int usleep(unsigned int useconds);
#ifdef PHP_EXPORTS #ifdef PHP_EXPORTS
/* This symbols are needed only for the DllMain, but should not be exported /* This symbols are needed only for the DllMain, but should not be exported
or be available when used with PHP binaries. */ or be available when used with PHP binaries. */
void php_win32_init_gettimeofday(void); void php_win32_init_gettimeofday(void);
#endif #endif