diff --git ldap/apr_ldap.c ldap/apr_ldap.c
index 25cf8f913..85efe7be6 100644
--- ldap/apr_ldap.c
+++ ldap/apr_ldap.c
@@ -769,6 +769,7 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_option_get(apr_pool_t *pool, apr_ldap_t
     memset(result, 0, sizeof(*result));
 
     switch (option) {
+#if !APR_HAS_ZOS_LDAPSDK
     case APR_LDAP_OPT_API_INFO: {
         LDAPAPIInfo info = { 0 };
 
@@ -798,6 +799,7 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_option_get(apr_pool_t *pool, apr_ldap_t
         break;
 
     }
+#endif
     case APR_LDAP_OPT_PROTOCOL_VERSION: {
 
         rc = ldap_get_option(ldap ? ldap->ld : NULL, LDAP_OPT_PROTOCOL_VERSION, &outvalue->pv);
@@ -810,6 +812,7 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_option_get(apr_pool_t *pool, apr_ldap_t
 
         return APR_SUCCESS;
     }
+#if !APR_HAS_ZOS_LDAPSDK
     case APR_LDAP_OPT_DESC: {
 
         apr_status_t status = APR_SUCCESS;
@@ -830,6 +833,7 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_option_get(apr_pool_t *pool, apr_ldap_t
 
         return status;
     }
+#endif
     case APR_LDAP_OPT_URI: {
 #if APR_HAS_OPENLDAP_LDAPSDK
         rc = ldap_get_option(ldap ? ldap->ld : NULL, option, &outvalue->opt);
@@ -1035,7 +1039,7 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_option_set(apr_pool_t *pool, apr_ldap_t
         break;
 
     case APR_LDAP_OPT_PROTOCOL_VERSION:
-        rc = ldap_set_option(ldap ? ldap->ld : NULL, LDAP_OPT_PROTOCOL_VERSION, &invalue->pv);
+        rc = ldap_set_option(ldap ? ldap->ld : NULL, LDAP_OPT_PROTOCOL_VERSION, (void*)&invalue->pv);
         break;
 
     case APR_LDAP_OPT_HANDLE:
@@ -1054,9 +1058,10 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_option_set(apr_pool_t *pool, apr_ldap_t
 #endif
 
     case APR_LDAP_OPT_DEREF:
-        rc = ldap_set_option(ldap ? ldap->ld : NULL, LDAP_OPT_DEREF, &invalue->deref);
+        rc = ldap_set_option(ldap ? ldap->ld : NULL, LDAP_OPT_DEREF, (void*)&invalue->deref);
         break;
 
+#if !APR_HAS_ZOS_LDAPSDK
     case APR_LDAP_OPT_REFERRALS: {
         void *refs = invalue->refs ? LDAP_OPT_ON : LDAP_OPT_OFF;
 
@@ -1066,6 +1071,7 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_option_set(apr_pool_t *pool, apr_ldap_t
         break;
 
     }
+#endif
     case APR_LDAP_OPT_REFHOPLIMIT:
 #if defined(LDAP_OPT_REFERRAL_HOP_LIMIT)
         /* Microsoft SDK defines LDAP_OPT_REFERRAL_HOP_LIMIT
@@ -1074,7 +1080,7 @@ APU_DECLARE_LDAP(apr_status_t) apr_ldap_option_set(apr_pool_t *pool, apr_ldap_t
 #elif defined(LDAP_OPT_REFHOPLIMIT)
         /* Setting this option is supported on TIVOLI_SDK.
          */
-        rc = ldap_set_option(ldap ? ldap->ld : NULL, LDAP_OPT_REFHOPLIMIT, &invalue->refhoplimit);
+        rc = ldap_set_option(ldap ? ldap->ld : NULL, LDAP_OPT_REFHOPLIMIT, (void*)&invalue->refhoplimit);
 #else
         /* If the LDAP_OPT_REFHOPLIMIT symbol is missing, assume that the
          * particular LDAP library has a reasonable default. So far certain