mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#6832 #elif cleanup

Browse Source
This commit is contained in:
Howard Chu 2011-02-17 00:36:30 +00:00
parent 7619c09e61
commit 6f1d218652
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/liblber/nt_err.c
View File

@ -17,7 +17,7 @@
#ifdef HAVE_WINSOCK2 #ifdef HAVE_WINSOCK2
#include <winsock2.h> #include <winsock2.h>
#elif HAVE_WINSOCK #elif defined(HAVE_WINSOCK)
#include <winsock.h> #include <winsock.h>
#endif /* HAVE_WINSOCK(2) */ #endif /* HAVE_WINSOCK(2) */

2
libraries/libldap/init.c
View File

@ -626,7 +626,7 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
return; return;
} }
} /* The WinSock DLL is acceptable. Proceed. */ } /* The WinSock DLL is acceptable. Proceed. */
#elif HAVE_WINSOCK #elif defined(HAVE_WINSOCK)
{ WSADATA wsaData; { WSADATA wsaData;
if ( WSAStartup( 0x0101, &wsaData ) != 0 ) { if ( WSAStartup( 0x0101, &wsaData ) != 0 ) {
return; return;

2
libraries/liblutil/detach.c
View File

@ -128,7 +128,7 @@ lutil_detach( int debug, int do_close )
#ifdef HAVE_SETSID #ifdef HAVE_SETSID
(void) setsid(); (void) setsid();
#elif TIOCNOTTY #elif defined(TIOCNOTTY)
if ( (sd = open( "/dev/tty", O_RDWR )) != -1 ) { if ( (sd = open( "/dev/tty", O_RDWR )) != -1 ) {
(void) ioctl( sd, TIOCNOTTY, NULL ); (void) ioctl( sd, TIOCNOTTY, NULL );
(void) close( sd ); (void) close( sd );

2
libraries/liblutil/entropy.c
View File

@ -73,7 +73,7 @@ int lutil_entropy( unsigned char *buf, ber_len_t nbytes )
close(fd); close(fd);
return nbytes > 0 ? -1 : 0; return nbytes > 0 ? -1 : 0;
} }
#elif PROV_RSA_FULL #elif defined(PROV_RSA_FULL)
{ {
/* Not used since _WIN32_WINNT not set... */ /* Not used since _WIN32_WINNT not set... */
HCRYPTPROV hProv = 0; HCRYPTPROV hProv = 0;