From 6f1d21865221e2264b9682c72ff6a3e166c33be8 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 17 Feb 2011 00:36:30 +0000 Subject: [PATCH] ITS#6832 #elif cleanup --- libraries/liblber/nt_err.c | 2 +- libraries/libldap/init.c | 2 +- libraries/liblutil/detach.c | 2 +- libraries/liblutil/entropy.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/liblber/nt_err.c b/libraries/liblber/nt_err.c index ced9f18804..407d67307e 100644 --- a/libraries/liblber/nt_err.c +++ b/libraries/liblber/nt_err.c @@ -17,7 +17,7 @@ #ifdef HAVE_WINSOCK2 #include -#elif HAVE_WINSOCK +#elif defined(HAVE_WINSOCK) #include #endif /* HAVE_WINSOCK(2) */ diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c index 9ad18bdffb..0057978a05 100644 --- a/libraries/libldap/init.c +++ b/libraries/libldap/init.c @@ -626,7 +626,7 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl ) return; } } /* The WinSock DLL is acceptable. Proceed. */ -#elif HAVE_WINSOCK +#elif defined(HAVE_WINSOCK) { WSADATA wsaData; if ( WSAStartup( 0x0101, &wsaData ) != 0 ) { return; diff --git a/libraries/liblutil/detach.c b/libraries/liblutil/detach.c index ad12e9c49d..dd89119ea8 100644 --- a/libraries/liblutil/detach.c +++ b/libraries/liblutil/detach.c @@ -128,7 +128,7 @@ lutil_detach( int debug, int do_close ) #ifdef HAVE_SETSID (void) setsid(); -#elif TIOCNOTTY +#elif defined(TIOCNOTTY) if ( (sd = open( "/dev/tty", O_RDWR )) != -1 ) { (void) ioctl( sd, TIOCNOTTY, NULL ); (void) close( sd ); diff --git a/libraries/liblutil/entropy.c b/libraries/liblutil/entropy.c index 47920fdcfd..ea887588ab 100644 --- a/libraries/liblutil/entropy.c +++ b/libraries/liblutil/entropy.c @@ -73,7 +73,7 @@ int lutil_entropy( unsigned char *buf, ber_len_t nbytes ) close(fd); return nbytes > 0 ? -1 : 0; } -#elif PROV_RSA_FULL +#elif defined(PROV_RSA_FULL) { /* Not used since _WIN32_WINNT not set... */ HCRYPTPROV hProv = 0; -- 2.39.5