ITS#6832 #elif cleanup

diff --git a/libraries/liblber/nt_err.c b/libraries/liblber/nt_err.c
index ced9f18804792867cc3db129d31c557c4d95125a..407d67307eae552f2d5f271c49aeead781d66d37 100644 (file)
--- a/libraries/liblber/nt_err.c
+++ b/libraries/liblber/nt_err.c
@@ -17,7 +17,7 @@
 
 #ifdef HAVE_WINSOCK2
 #include <winsock2.h>
-#elif HAVE_WINSOCK
+#elif defined(HAVE_WINSOCK)
 #include <winsock.h>
 #endif /* HAVE_WINSOCK(2) */
 

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 9ad18bdffb261a11ed69a49b58b0a590a8076024..0057978a05d79ad9147a686997b2b44e72614c72 100644 (file)
--- 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 ad12e9c49d87c9e314be0a1bb302ba075277b8b1..dd89119ea84afa14077be0dadafd52952a8b7ab6 100644 (file)
--- 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 47920fdcfde1f0f42117b1f96ae4c6b26b263529..ea887588ab75edc477945be3d2df0b86d72b4d44 100644 (file)
--- 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;