Skip to content

Sync #if/ifdef/defined #14508

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.

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

Merged
merged 1 commit into from
Jun 9, 2024
Merged

Sync #if/ifdef/defined #14508

merged 1 commit into from
Jun 9, 2024

Conversation

petk
Copy link
Member

@petk petk commented Jun 8, 2024

This syncs CPP macro conditions:

  • _WIN32
  • _WIN64
  • HAVE_ALLOCA_H
  • HAVE_ALPHASORT
  • HAVE_ARPA_INET_H
  • HAVE_CONFIG_H
  • HAVE_DIRENT_H
  • HAVE_DLFCN_H
  • HAVE_GETTIMEOFDAY
  • HAVE_LIBDL
  • HAVE_POLL_H
  • HAVE_PWD_H
  • HAVE_SCANDIR
  • HAVE_SYS_FILE_H
  • HAVE_SYS_PARAM_H
  • HAVE_SYS_SOCKET_H
  • HAVE_SYS_TIME_H
  • HAVE_SYS_TYPES_H
  • HAVE_SYS_WAIT_H
  • HAVE_UNISTD_H
  • PHP_WIN32
  • ZEND_WIN32

These are either undefined or defined to 1 in Autotools and Windows.

Follow up of GH-5526 (-Wundef).

This syncs CPP macro conditions:
- _WIN32
- _WIN64
- HAVE_ALLOCA_H
- HAVE_ALPHASORT
- HAVE_ARPA_INET_H
- HAVE_CONFIG_H
- HAVE_DIRENT_H
- HAVE_DLFCN_H
- HAVE_GETTIMEOFDAY
- HAVE_LIBDL
- HAVE_POLL_H
- HAVE_PWD_H
- HAVE_SCANDIR
- HAVE_SYS_FILE_H
- HAVE_SYS_PARAM_H
- HAVE_SYS_SOCKET_H
- HAVE_SYS_TIME_H
- HAVE_SYS_TYPES_H
- HAVE_SYS_WAIT_H
- HAVE_UNISTD_H
- PHP_WIN32
- ZEND_WIN32

These are either undefined or defined to 1 in Autotools and Windows.

Follow up of phpGH-5526 (-Wundef).
Copy link
Member

@Girgias Girgias left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Everything looks correct to me

Copy link
Member

@TimWolla TimWolla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ack for ext/random

Copy link
Member

@nielsdos nielsdos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All seems right

Copy link
Member

@devnexen devnexen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

@petk
Copy link
Member Author

petk commented Jun 9, 2024

I think nothing much problematic is changed here and all has been rechecked again, so merge coming up... Thanks for the reviews.

@petk petk merged commit 84a0da1 into php:master Jun 9, 2024
11 checks passed
@petk petk deleted the patch-wundef branch June 9, 2024 12:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants