Alexandre Julliard : ldap: Use LONG instead of long for exported types.
Module: wine Branch: master Commit: f48500bb3ab5b1cdb73d604719d1918443d924e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/f48500bb3ab5b1cdb73d604719d1918... Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 14:52:26 2022 +0100 ldap: Use LONG instead of long for exported types. --- libs/ldap/include/lber_types.h | 11 ++++++----- libs/ldap/include/portable.h | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/ldap/include/lber_types.h b/libs/ldap/include/lber_types.h index c32b803a89a..e5991e597e5 100644 --- a/libs/ldap/include/lber_types.h +++ b/libs/ldap/include/lber_types.h @@ -21,6 +21,7 @@ #ifndef _LBER_TYPES_H #define _LBER_TYPES_H +#include <windef.h> #include <ldap_cdefs.h> LDAP_BEGIN_DECL @@ -29,13 +30,13 @@ LDAP_BEGIN_DECL #define LBER_INT_T int /* LBER tags (32 bits or larger) */ -#define LBER_TAG_T long +#undef LBER_TAG_T /* LBER socket descriptor */ #define LBER_SOCKET_T int /* LBER lengths (32 bits or larger) */ -#define LBER_LEN_T long +#undef LBER_LEN_T /* ------------------------------------------------------------ */ @@ -47,16 +48,16 @@ typedef signed LBER_INT_T ber_sint_t; typedef unsigned LBER_INT_T ber_uint_t; /* tags */ -typedef unsigned LBER_TAG_T ber_tag_t; +typedef ULONG ber_tag_t; /* "socket" descriptors */ typedef LBER_SOCKET_T ber_socket_t; /* lengths */ -typedef unsigned LBER_LEN_T ber_len_t; +typedef ULONG ber_len_t; /* signed lengths */ -typedef signed LBER_LEN_T ber_slen_t; +typedef LONG ber_slen_t; LDAP_END_DECL diff --git a/libs/ldap/include/portable.h b/libs/ldap/include/portable.h index d3867575fca..410ed9e31de 100644 --- a/libs/ldap/include/portable.h +++ b/libs/ldap/include/portable.h @@ -813,13 +813,13 @@ #define LBER_INT_T int /* define to large integer type */ -#define LBER_LEN_T long +/* #undef LBER_LEN_T */ /* define to socket descriptor type */ #define LBER_SOCKET_T int /* define to large integer type */ -#define LBER_TAG_T long +/* #undef LBER_TAG_T */ /* define to 1 if library is reentrant */ #define LDAP_API_FEATURE_X_OPENLDAP_REENTRANT 1
participants (1)
-
Alexandre Julliard