Undo assert fix included in last commit.

Add extra AC_HTONL for win32 alpha.

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 501426b135a316c59d7d683de4b14811e324fb66..0e0a4a93c012e8a04683240bbc258686c5fc6b9e 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -87,10 +87,14 @@
 #      define ioctl_t                          int
 #endif
 
-#if !defined(__alpha) || defined(VMS)
-#define AC_HTONL( l ) htonl( l )
-#define AC_NTOHL( l ) ntohl( l )
-#else /* __alpha && !VMS */
+#if    defined(__WIN32) && defined(_ALPHA)
+/* NT on Alpha is hosed. */
+#define AC_HTONL( l ) \
+        ((((l)&0xff)<<24) + (((l)&0xff00)<<8) + \
+         (((l)&0xff0000)>>8) + (((l)&0xff000000)>>24))
+#define AC_NTOHL(l) LBER_HTONL(l)
+
+#elif defined(__alpha) && !defined(VMS)
 /*
  * htonl and ntohl on the DEC Alpha under OSF 1 seem to only swap the
  * lower-order 32-bits of a (64-bit) long, so we define correct versions
@@ -102,7 +106,10 @@
 #define AC_NTOHL( l ) (((long)ntohl( (l) & 0x00000000FFFFFFFF )) << 32 \
        | ntohl( ( (l) & 0xFFFFFFFF00000000 ) >> 32 ))
 
-#endif /* __alpha && !VMS */
+#else
+#define AC_HTONL( l ) htonl( l )
+#define AC_NTOHL( l ) ntohl( l )
+#endif
 
 
 #endif /* _AC_SOCKET_H_ */

diff --git a/include/portable.h.nt b/include/portable.h.nt
index 00302646aee767a6f971f1dc569fda3205baa6b1..c0044b82d6079d876e8fa2b00578f27b89b868e9 100644 (file)
--- a/include/portable.h.nt
+++ b/include/portable.h.nt
@@ -715,7 +715,6 @@ typedef char * caddr_t;
 #ifdef HAVE_STDDEF_H
 #      include <stddef.h>
 #endif
-#include <ac/assert.h>
 
 #if defined(LDAP_DEVEL) && !defined(LDAP_TEST)
 #define LDAP_TEST
@@ -727,4 +726,6 @@ typedef char * caddr_t;
 #include "ldap_cdefs.h"
 #include "ldap_features.h"
 
+#include <ac/assert.h>
+
 #endif /* _LDAP_PORTABLE_H */