Commit: 088538f717bbafc5079940f3df298172a38ec4c1 - mingw-org-wsl (git)

The MinGW.org Windows System Libraries

Commit MetaInfo

• Revision: 088538f717bbafc5079940f3df298172a38ec4c1 (tree)
• Time: 2013-09-19 05:28:09
• Author: Earnie Boyd <earnie@user...>
• Commiter: Earnie Boyd

Log Message

Resolve issues [#2046] and [#2027].

Change Summary

• modified: ChangeLog
• modified: include/unistd.h
• modified: include/winldap.h

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 RELEASE 4.1:
 
[phone]  Earnie Boyd  <[e-mail]>
+
+	* include/unistd.h (ftruncate()): Guard with no __STRICT_ANSI__ [#2046].
+	* include/winldap.h (ldap_start_tls_s[AW]()): Incorrect signature
+	[#2027].
+	(ldap_stop_tls_s()): Use PLDAP instead of LDAP * per MSDN documentation.
+
 2013-04-10  Earnie Boyd  <[e-mail]>
 	* include/windows.h (NOWH): Correct typo in macro name.
 	* include/excpt.h (_EXCEPTION_DISPOSITION): Adjust indentation.

--- a/include/unistd.h
+++ b/include/unistd.h
@@ -60,6 +60,7 @@ extern "C" {
 int __cdecl __MINGW_NOTHROW usleep(useconds_t useconds);
 #endif  /* Not __NO_ISOCEXT */
 
+#ifndef __STRICT_ANSI__
 /* This is defined as a real library function to allow autoconf
    to verify its existence. */
 int ftruncate(int, off_t);
@@ -69,6 +70,7 @@ __CRT_INLINE int ftruncate(int __fd, off_t __length)
   return _chsize (__fd, __length);
 }
 #endif
+#endif /* ndef __STRICT_ANSI__ */
 
 #ifdef __cplusplus
 }

--- a/include/winldap.h
+++ b/include/winldap.h
@@ -385,9 +385,9 @@ WINLDAPAPI PLDAP cldap_openW(const PWCHAR,ULONG);
 WINLDAPAPI ULONG ldap_connect(LDAP*,struct l_timeval*);
 WINLDAPAPI PLDAP ldap_sslinitA(PCHAR,ULONG,int);
 WINLDAPAPI PLDAP ldap_sslinitW(PWCHAR,ULONG,int);
-WINLDAPAPI ULONG ldap_start_tls_sA(LDAP*,PLDAPControlA*,PLDAPControlA*);
-WINLDAPAPI ULONG ldap_start_tls_sW(LDAP*,PLDAPControlW*,PLDAPControlW*);
-WINLDAPAPI BOOLEAN ldap_stop_tls_s(LDAP*);
+WINLDAPAPI ULONG ldap_start_tls_sA(PLDAP,PULONG,LDAPMessage,PLDAPControlA*,PLDAPControlA*);
+WINLDAPAPI ULONG ldap_start_tls_sW(PLDAP,PULONG,LDAPMessage,PLDAPControlW*,PLDAPControlW*);
+WINLDAPAPI BOOLEAN ldap_stop_tls_s(PLDAP);
 WINLDAPAPI ULONG ldap_get_optionA(LDAP*,int,void*);
 WINLDAPAPI ULONG ldap_get_optionW(LDAP*,int,void*);
 WINLDAPAPI ULONG ldap_set_optionA(LDAP*,int,const void*);