Remove macros

  htole{s,l,q}, letoh{s,l,q},  htobe{s,l,q}, betoh{s,l,q}
and replace it with more standard byteorder macros in our system.

1 files changed, 5 insertions, 6 deletions

diff --git a/contrib/smbfs/lib/smb/rap.c b/contrib/smbfs/lib/smb/rap.c
index e595bc1..19e803d 100644
--- a/contrib/smbfs/lib/smb/rap.c
+++ b/contrib/smbfs/lib/smb/rap.c
@@ -35,6 +35,7 @@
  * This is very simple implementation of RAP protocol.
  */
 #include <sys/param.h>
+#include <sys/endian.h>
 #include <sys/errno.h>
 #include <sys/stat.h>
 #include <ctype.h>
@@ -45,8 +46,6 @@
 #include <stdlib.h>
 #include <sysexits.h>
 
-#include <sys/mchain.h>
-
 #include <netsmb/smb_lib.h>
 #include <netsmb/smb_conn.h>
 #include <netsmb/smb_rap.h>
@@ -290,7 +289,7 @@ smb_rap_getNparam(struct smb_rap *rap, long *value)
 		return error;
 	switch (ptype) {
 	    case 'h':
-		*value = letohs(*(u_int16_t*)rap->r_npbuf);
+		*value = le16toh(*(u_int16_t*)rap->r_npbuf);
 		break;
 	    default:
 		return EINVAL;
@@ -320,8 +319,8 @@ smb_rap_request(struct smb_rap *rap, struct smb_ctx *ctx)
 	if (error)
 		return error;
 	rp = (u_int16_t*)rap->r_pbuf;
-	rap->r_result = letohs(*rp++);
-	conv = letohs(*rp++);
+	rap->r_result = le16toh(*rp++);
+	conv = le16toh(*rp++);
 	rap->r_npbuf = (char*)rp;
 	rap->r_entries = entries = 0;
 	done = 0;
@@ -329,7 +328,7 @@ smb_rap_request(struct smb_rap *rap, struct smb_ctx *ctx)
 		ptype = *p;
 		switch (ptype) {
 		    case 'e':
-			rap->r_entries = entries = letohs(*(u_int16_t*)rap->r_npbuf);
+			rap->r_entries = entries = le16toh(*(u_int16_t*)rap->r_npbuf);
 			rap->r_npbuf += 2;
 			p++;
 			break;