wrowe 2002/12/10 21:31:12
Modified: include apr_ldap.hw apr_ldap_url.h
ldap apr_ldap_url.c
Log:
Eliminate LDAP_CONST ... needs to be decorated if we plan to deal with
this issue anyways.
Revision Changes Path
1.4 +0 -5 apr-util/include/apr_ldap.hw
Index: apr_ldap.hw
===================================================================
RCS file: /home/cvs/apr-util/include/apr_ldap.hw,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apr_ldap.hw 11 Dec 2002 02:31:04 -0000 1.3
+++ apr_ldap.hw 11 Dec 2002 05:31:12 -0000 1.4
@@ -121,11 +121,6 @@
* LDAP Compatibility
*/
-/* Empty declaration, Win32 const'ness in SDK library headers is
- * generally bogus
- */
-#define LDAP_CONST
-
/* These don't apply on Win32, leave them in place for reference
*/
#if LDAP_VERSION_MAX <= 2
1.2 +4 -4 apr-util/include/apr_ldap_url.h
Index: apr_ldap_url.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_ldap_url.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_ldap_url.h 11 Dec 2002 02:31:04 -0000 1.1
+++ apr_ldap_url.h 11 Dec 2002 05:31:12 -0000 1.2
@@ -103,13 +103,13 @@
*
* need _ext varients
*/
-APU_DECLARE(int) apr_ldap_is_ldap_url(LDAP_CONST char *url);
+APU_DECLARE(int) apr_ldap_is_ldap_url(const char *url);
-APU_DECLARE(int) apr_ldap_is_ldaps_url(LDAP_CONST char *url);
+APU_DECLARE(int) apr_ldap_is_ldaps_url(const char *url);
-APU_DECLARE(int) apr_ldap_is_ldapi_url(LDAP_CONST char *url);
+APU_DECLARE(int) apr_ldap_is_ldapi_url(const char *url);
-APU_DECLARE(int) apr_ldap_url_parse(LDAP_CONST char *url,
+APU_DECLARE(int) apr_ldap_url_parse(const char *url,
apr_ldap_url_desc_t **ludpp);
APU_DECLARE(void) apr_ldap_free_urldesc(apr_ldap_url_desc_t *ludp);
1.2 +5 -5 apr-util/ldap/apr_ldap_url.c
Index: apr_ldap_url.c
===================================================================
RCS file: /home/cvs/apr-util/ldap/apr_ldap_url.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apr_ldap_url.c 11 Dec 2002 02:31:03 -0000 1.1
+++ apr_ldap_url.c 11 Dec 2002 05:31:12 -0000 1.2
@@ -150,7 +150,7 @@
static char **ldap_str2charray(const char *str, const char *brkstr);
-APU_DECLARE(int) apr_ldap_is_ldap_url(LDAP_CONST char *url)
+APU_DECLARE(int) apr_ldap_is_ldap_url(const char *url)
{
int enclosed;
const char * scheme;
@@ -166,7 +166,7 @@
return 1;
}
-APU_DECLARE(int) apr_ldap_is_ldaps_url(LDAP_CONST char *url)
+APU_DECLARE(int) apr_ldap_is_ldaps_url(const char *url)
{
int enclosed;
const char * scheme;
@@ -182,7 +182,7 @@
return strcmp(scheme, "ldaps") == 0;
}
-APU_DECLARE(int) apr_ldap_is_ldapi_url(LDAP_CONST char *url)
+APU_DECLARE(int) apr_ldap_is_ldapi_url(const char *url)
{
int enclosed;
const char * scheme;
@@ -276,7 +276,7 @@
}
-static int ldap_url_parse_ext(LDAP_CONST char *url_in,
+static int ldap_url_parse_ext(const char *url_in,
apr_ldap_url_desc_t **ludpp)
{
/*
@@ -594,7 +594,7 @@
return LDAP_URL_SUCCESS;
}
-APU_DECLARE(int) apr_ldap_url_parse(LDAP_CONST char *url_in,
+APU_DECLARE(int) apr_ldap_url_parse(const char *url_in,
apr_ldap_url_desc_t **ludpp)
{
int rc = ldap_url_parse_ext( url_in, ludpp );
