From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 24 Nov 2010 14:47:46 +0000 (+0000)
Subject: remove #ifdef EAGAIN, EWOULDBLOCK (ITS#6603)
X-Git-Tag: MIGRATION_CVS2GIT~397
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=603eec5758fd54040396e54f955fe0aeef3e0f59;p=openldap

remove #ifdef EAGAIN, EWOULDBLOCK (ITS#6603)
---

diff --git a/libraries/liblber/io.c b/libraries/liblber/io.c
index f494e91238..d84c1907cd 100644
--- a/libraries/liblber/io.c
+++ b/libraries/liblber/io.c
@@ -549,11 +549,7 @@ ber_get_next(
 				}
 				/* Did we run out of bytes? */
 				if ((char *)p == ber->ber_rwptr) {
-#if defined( EWOULDBLOCK )
 					sock_errset(EWOULDBLOCK);
-#elif defined( EAGAIN )
-					sock_errset(EAGAIN);
-#endif			
 					return LBER_DEFAULT;
 				}
 			}
@@ -562,11 +558,7 @@ ber_get_next(
 		}
 
 		if ( ber->ber_ptr == ber->ber_rwptr ) {
-#if defined( EWOULDBLOCK )
 			sock_errset(EWOULDBLOCK);
-#elif defined( EAGAIN )
-			sock_errset(EAGAIN);
-#endif			
 			return LBER_DEFAULT;
 		}
 
@@ -581,11 +573,7 @@ ber_get_next(
 			}
 			/* Not enough bytes? */
 			if (ber->ber_rwptr - (char *)p < llen) {
-#if defined( EWOULDBLOCK )
 				sock_errset(EWOULDBLOCK);
-#elif defined( EAGAIN )
-				sock_errset(EAGAIN);
-#endif			
 				return LBER_DEFAULT;
 			}
 			for (i=0; i<llen; i++) {
@@ -672,11 +660,7 @@ ber_get_next(
 		ber->ber_rwptr+=res;
 		
 		if (res<to_go) {
-#if defined( EWOULDBLOCK )
 			sock_errset(EWOULDBLOCK);
-#elif defined( EAGAIN )
-			sock_errset(EAGAIN);
-#endif			
 			return LBER_DEFAULT;
 		}
 done:
diff --git a/libraries/libldap/result.c b/libraries/libldap/result.c
index a50d7c2a29..a05c405333 100644
--- a/libraries/libldap/result.c
+++ b/libraries/libldap/result.c
@@ -498,12 +498,8 @@ nextresp3:
 		Debug( LDAP_DEBUG_CONNS,
 			"ber_get_next failed.\n", 0, 0, 0 );
 #endif		   
-#ifdef EWOULDBLOCK			
 		if ( err == EWOULDBLOCK ) return LDAP_MSG_X_KEEP_LOOKING;
-#endif
-#ifdef EAGAIN
 		if ( err == EAGAIN ) return LDAP_MSG_X_KEEP_LOOKING;
-#endif
 		ld->ld_errno = LDAP_SERVER_DOWN;
 		--lc->lconn_refcnt;
 		lc->lconn_status = 0;