diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-03-14 23:21:17 +0100 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-03-18 02:11:23 +0100 |
| commit | ccc29473ecdb07d9735e7b6361b7daeec6c3ede1 (patch) | |
| tree | b359c40cbd61053f672c598ec0275ae9e7938de2 /ext/pdo_oci | |
| parent | b6f9ade9f201c852430689caf8ed8af0ded0159a (diff) | |
| download | php-git-ccc29473ecdb07d9735e7b6361b7daeec6c3ede1.tar.gz | |
Sync AC_CHECK_SIZEOF m4 macro calls
- AC_CHECK_SIZEOF is now called mostly only in PHP_CHECK_STDINT_TYPES()
macro except for some parts checking for the 32 or 64 bit architecture.
- SIZEOF_CHAR removed since it is always 1
- ZEND_BIN_ID is now of a more logical pattern `BIN_48888` on 64bit
architectures and `BIN_44444` on 32bit instead of literal string
`BIN_SIZEOF_CHAR48888` on 64bit and `BIN_SIZEOF_CHAR44444` on 32bit.
The unneeded SIZEOF_CHAR part has been removed.
- XMLRPC_TYPE_CHECKS removed
- The `long long int` is the same as `long long` and redundant checks
removed accordingly.
- Removed PHP_CHECK_64BIT macro. Checking if current platform is 64bit
or not can be also done simply by using a check of the long type on
place. This removes redundant m4 macro PHP_CHECK_64BIT.
Diffstat (limited to 'ext/pdo_oci')
| -rw-r--r-- | ext/pdo_oci/config.m4 | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/ext/pdo_oci/config.m4 b/ext/pdo_oci/config.m4 index 12791b2fe0..c692483394 100644 --- a/ext/pdo_oci/config.m4 +++ b/ext/pdo_oci/config.m4 @@ -30,15 +30,15 @@ AC_DEFUN([AC_PDO_OCI_VERSION],[ ]) AC_DEFUN([AC_PDO_OCI_CHECK_LIB_DIR],[ - AC_CHECK_SIZEOF(long int, 4) - AC_MSG_CHECKING([if we're on a 64-bit platform]) - if test "$ac_cv_sizeof_long_int" = "4" ; then + AC_CHECK_SIZEOF([long]) + AC_MSG_CHECKING([if we're at 64-bit platform]) + AS_IF([test "$ac_cv_sizeof_long" -eq 4],[ AC_MSG_RESULT([no]) TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32" - else + ],[ AC_MSG_RESULT([yes]) TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib" - fi + ]) AC_MSG_CHECKING([OCI8 libraries dir]) if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then @@ -82,12 +82,16 @@ if test "$PHP_PDO_OCI" != "no"; then fi if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then - AC_CHECK_SIZEOF(long int, 4) - if test "$ac_cv_sizeof_long_int" = "4" ; then + AC_CHECK_SIZEOF([long]) + AC_MSG_CHECKING([if we're at 64-bit platform]) + AS_IF([test "$ac_cv_sizeof_long" -eq 4],[ + AC_MSG_RESULT([no]) PDO_OCI_CLIENT_DIR="client" - else + ],[ + AC_MSG_RESULT([yes]) PDO_OCI_CLIENT_DIR="client64" - fi + ]) + PDO_OCI_LIB_DIR="`echo $PDO_OCI_DIR | cut -d, -f2`" AC_PDO_OCI_VERSION($PDO_OCI_LIB_DIR) |