Use correct namespace for (BER_)STRLENOF

This commit is contained in:
Ondřej Kuzník 2018-07-19 08:33:43 +01:00
parent 776de6d796
commit 8ee03cea88

View file

@ -201,11 +201,8 @@ ber_bvarray_dup_x LDAP_P(( BerVarray *dst, BerVarray src, void *ctx ));
(dst)->bv_val = (bv)->bv_val; \
} while (0)
#ifndef STRLENOF
#define STRLENOF(s) (sizeof(s)-1)
#endif
#define BER_BVC(s) { STRLENOF(s), (char *)(s) }
#define BER_STRLENOF(s) (sizeof(s)-1)
#define BER_BVC(s) { BER_STRLENOF(s), (char *)(s) }
#define BER_BVNULL { 0L, NULL }
#define BER_BVZERO(bv) \
do { \
@ -214,7 +211,7 @@ ber_bvarray_dup_x LDAP_P(( BerVarray *dst, BerVarray src, void *ctx ));
} while (0)
#define BER_BVSTR(bv,s) \
do { \
(bv)->bv_len = STRLENOF(s); \
(bv)->bv_len = BER_STRLENOF(s); \
(bv)->bv_val = (s); \
} while (0)
#define BER_BVISNULL(bv) ((bv)->bv_val == NULL)