Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use "_WIN32" macro #2905

Closed
wants to merge 6 commits into from
Closed

Use "_WIN32" macro #2905

wants to merge 6 commits into from

Commits on Nov 6, 2017

  1. fix wrong check of definition_phi->constraint.range.max_ssa_var

    @herumi
    herumi authored and Steven Penny committed Nov 6, 2017
    Copy the full SHA
    4d44812 View commit details
    Browse the repository at this point in the history

  2. Don't intern strings in-place if their refcoung greater than 1

    @dstogov
    dstogov authored and Steven Penny committed Nov 6, 2017
    Copy the full SHA
    42bd17c View commit details
    Browse the repository at this point in the history

  3. Fixed memory leak (Zend/tests/list_003.phpt)

    @dstogov
    dstogov authored and Steven Penny committed Nov 6, 2017
    Copy the full SHA
    bbf26d8 View commit details
    Browse the repository at this point in the history

  4. Removed workaraouns for inconsistent zvals (REFCOUNTED+INTERNED). The… 

    …y should be fixed now.
    @dstogov
    dstogov authored and Steven Penny committed Nov 6, 2017
    Copy the full SHA
    75fb73e View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/php/php-src

    Steven Penny committed Nov 6, 2017
    Copy the full SHA
    23aa534 View commit details
    Browse the repository at this point in the history

  6. Use "_WIN32" macro 

    PHP_WIN32 can be replaced, as it was introduced as a duplicate of
ZEND_WIN32 [1]:

    #define PHP_WIN32 ZEND_WIN32

ZEND_WIN32 can be replaced, as it was introduced as a concise way to check for
Windows [2]:

    #define ZEND_WIN32 ((defined(WINNT) && WINNT) || (defined(WIN32) && WIN32))

WINNT was introduced as a way to check for Windows NT [3]:

    #if WIN32|WINNT
      // Get build numbers for Windows NT or Win95
      if (dwVersion < 0x80000000){
        php3_os="WINNT";
      } else {
        php3_os="WIN32";
      }
    #else
      php3_os=PHP_OS;
    #endif

Windows NT [4] is no longer supported by PHP. "_WIN32" [5] is the documented
macro for Windows. Also I removed "_WINDOWS" because it was defined but never
used, and replaced WINDOWS as well because it is also not documented.

[1] http://github.com/php/php-src/commit/f452c77
[2] http://github.com/php/php-src/commit/bc5c9d8
[3] http://github.com/php/php-src/commit/573b460
[4] http://wikipedia.org/wiki/Windows_NT_4.0
[5] http://docs.microsoft.com/cpp/preprocessor/predefined-macros
    Steven Penny committed Nov 6, 2017
    Copy the full SHA
    8e1c95b View commit details
    Browse the repository at this point in the history