Partial revert of 1288f26f and fix for no-async

The commit 1288f26f says that it fixes no-async, but instead seems to break
it. Therefore revert that change and fix no-async.
Reviewed-by: NRich Salz <rsalz@openssl.org>

Configure

@@ -800,7 +800,7 @@ foreach (sort (keys %disabled))
 		my ($ALGO, $algo);
 		($ALGO = $algo = $_) =~ tr/[\-a-z]/[_A-Z]/;
 
-		if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/
+		if (/^asm$/ || /^err$/ || /^hw$/ || /^hw-/ || /^async$/
 				|| /^autoalginit/ || /^autoerrinit/)
 			{
 			push @{$config{openssl_other_defines}}, "OPENSSL_NO_$ALGO";

include/openssl/async.h

@@ -50,17 +50,11 @@
  * ====================================================================
  */
 
+#include <stdlib.h>
+
 #ifndef HEADER_ASYNC_H
 # define HEADER_ASYNC_H
 
-#include <openssl/opensslconf.h>
-
-#ifdef OPENSSL_NO_ASYNC
-#define ASYNC_block_pause() do { ; } while(0)
-#define ASYNC_unblock_pause() do { ; } while(0)
-#else
-#include <stdlib.h>
-
 #if defined(_WIN32)
 #include <windows.h>
 #define OSSL_ASYNC_FD   HANDLE
@@ -122,5 +116,4 @@ void ERR_load_ASYNC_strings(void);
 #ifdef  __cplusplus
 }
 #endif
-#endif /* OPENSSL_NO_ASYNC */
 #endif