PHP 7.4: ulong->unsigned long, uint->uint32_t

[m6w6/ext-http] / src / php_http_curl.c

diff --git a/src/php_http_curl.c b/src/php_http_curl.c
index a9950948d1c5ebb66ae8c3e4b9b7568e7ec99b7a..63bc104f2a58f0ae2b05c5edcd1e905e87d77802 100644 (file)
--- a/src/php_http_curl.c
+++ b/src/php_http_curl.c
@@ -12,25 +12,26 @@
 
 #include "php_http_api.h"
 
-#if PHP_HTTP_HAVE_CURL
+#if PHP_HTTP_HAVE_LIBCURL
 
-#if defined(ZTS) && defined(PHP_HTTP_HAVE_SSL)
-#      ifdef PHP_WIN32
-#              define PHP_HTTP_NEED_OPENSSL_TSL
+#if ZTS && PHP_HTTP_HAVE_LIBCURL_SSL
+#      include "TSRM.h"
+#      if PHP_WIN32
+#              define PHP_HTTP_NEED_OPENSSL_TSL 1
 #              include <openssl/crypto.h>
 #      else /* !PHP_WIN32 */
-#              if defined(PHP_HTTP_HAVE_OPENSSL)
-#                      define PHP_HTTP_NEED_OPENSSL_TSL
+#              if PHP_HTTP_HAVE_LIBCURL_OPENSSL
+#                      define PHP_HTTP_NEED_OPENSSL_TSL 1
 #                      include <openssl/crypto.h>
-#              elif defined(PHP_HTTP_HAVE_GNUTLS)
-#                      define PHP_HTTP_NEED_GNUTLS_TSL
+#              elif PHP_HTTP_HAVE_LIBCURL_GNUTLS
+#                      define PHP_HTTP_NEED_GNUTLS_TSL 1
 #                      include <gcrypt.h>
-#              endif /* PHP_HTTP_HAVE_OPENSSL || PHP_HTTP_HAVE_GNUTLS */
+#              endif /* PHP_HTTP_HAVE_LIBCURL_OPENSSL || PHP_HTTP_HAVE_LIBCURL_GNUTLS */
 #      endif /* PHP_WIN32 */
-#endif /* ZTS && PHP_HTTP_HAVE_SSL */
+#endif /* ZTS && PHP_HTTP_HAVE_LIBCURL_SSL */
 
 
-#ifdef PHP_HTTP_NEED_OPENSSL_TSL
+#if PHP_HTTP_NEED_OPENSSL_TSL
 static MUTEX_T *php_http_openssl_tsl = NULL;
 
 static void php_http_openssl_thread_lock(int mode, int n, const char * file, int line)
@@ -42,12 +43,12 @@ static void php_http_openssl_thread_lock(int mode, int n, const char * file, int
        }
 }
 
-static ulong php_http_openssl_thread_id(void)
+static unsigned long php_http_openssl_thread_id(void)
 {
-       return (ulong) tsrm_thread_id();
+       return (unsigned long) tsrm_thread_id();
 }
 #endif
-#ifdef PHP_HTTP_NEED_GNUTLS_TSL
+#if PHP_HTTP_NEED_GNUTLS_TSL
 static int php_http_gnutls_mutex_create(void **m)
 {
        if (*((MUTEX_T *) m) = tsrm_mutex_alloc()) {
@@ -86,7 +87,7 @@ static struct gcry_thread_cbs php_http_gnutls_tsl = {
 
 PHP_MINIT_FUNCTION(http_curl)
 {
-#ifdef PHP_HTTP_NEED_OPENSSL_TSL
+#if PHP_HTTP_NEED_OPENSSL_TSL
        /* mod_ssl, libpq or ext/curl might already have set thread lock callbacks */
        if (!CRYPTO_get_id_callback()) {
                int i, c = CRYPTO_num_locks();
@@ -101,7 +102,7 @@ PHP_MINIT_FUNCTION(http_curl)
                CRYPTO_set_locking_callback(php_http_openssl_thread_lock);
        }
 #endif
-#ifdef PHP_HTTP_NEED_GNUTLS_TSL
+#if PHP_HTTP_NEED_GNUTLS_TSL
        gcry_control(GCRYCTL_SET_THREAD_CBS, &php_http_gnutls_tsl);
 #endif
 
@@ -115,7 +116,7 @@ PHP_MINIT_FUNCTION(http_curl)
 PHP_MSHUTDOWN_FUNCTION(http_curl)
 {
        curl_global_cleanup();
-#ifdef PHP_HTTP_NEED_OPENSSL_TSL
+#if PHP_HTTP_NEED_OPENSSL_TSL
        if (php_http_openssl_tsl) {
                int i, c = CRYPTO_num_locks();
 
@@ -133,7 +134,7 @@ PHP_MSHUTDOWN_FUNCTION(http_curl)
        return SUCCESS;
 }
 
-#endif /* PHP_HTTP_HAVE_CURL */
+#endif /* PHP_HTTP_HAVE_LIBCURL */
 
 /*
  * Local variables: