#define ber_strccmp(s,c) \
( (s)[0] == (c) && (s)[1] == '\0' )
-LBER_F( char * )
-ber_bvchr LDAP_P(( struct berval *bv, char c ));
+#define ber_bvchr(bv,c) \
+ memchr( (bv)->bv_val, (c), (bv)->bv_len )
+
+#define BER_BVC(x) { sizeof( (x) ) - 1, (x) }
LDAP_END_DECL