@@ -3365,11 +3365,13 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
33653365int port = LDAP_DEF_PORT ,
33663366scope ,
33673367rc ,
3368- msgid ,
33693368size ,
33703369state ,
33713370oldstate ,
33723371i ;
3372+ #ifndef WIN32
3373+ int msgid ;
3374+ #endif
33733375bool found_keyword ;
33743376char * url ,
33753377* hostname ,
@@ -3514,11 +3516,13 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
35143516
35153517/*
35163518 * Perform an explicit anonymous bind.
3517- * LDAP does not require that an anonymous bind is preformed explicitly,
3519+ *
3520+ * LDAP does not require that an anonymous bind is performed explicitly,
35183521 * but we want to distinguish between the case where LDAP bind does not
35193522 * succeed within PGLDAP_TIMEOUT seconds (return 2 to continue parsing
35203523 * the service control file) and the case where querying the LDAP server
35213524 * fails (return 1 to end parsing).
3525+ *
35223526 * Unfortunately there is no way of setting a timeout that works for
35233527 * both Windows and OpenLDAP.
35243528 */
@@ -3531,7 +3535,7 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
35313535ldap_unbind (ld );
35323536return 2 ;
35333537}
3534- #else /* WIN32 */
3538+ #else /*! WIN32 */
35353539/* in OpenLDAP, use the LDAP_OPT_NETWORK_TIMEOUT option */
35363540if (ldap_set_option (ld ,LDAP_OPT_NETWORK_TIMEOUT ,& time )!= LDAP_SUCCESS )
35373541{
@@ -3786,7 +3790,8 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
37863790
37873791return 0 ;
37883792}
3789- #endif
3793+
3794+ #endif /* USE_LDAP */
37903795
37913796#define MAXBUFSIZE 256
37923797