Fixes to improve portability (especially to OS X, Solaris, OpenBSD).

[ircu2.10.12-pk.git] / include / ircd_reslib.h

diff --git a/include/ircd_reslib.h b/include/ircd_reslib.h
index 9dd6e2555b71ba44865641d1db851c222909bb6e..c42be748296d5db92198b3b75817cfd62781b37a 100644 (file)
--- a/include/ircd_reslib.h
+++ b/include/ircd_reslib.h
@@ -14,24 +14,24 @@
  */
 #define IRC_NS_GET16(s, cp) { \
        const unsigned char *t_cp = (const unsigned char *)(cp); \
-       (s) = ((u_int16_t)t_cp[0] << 8) \
-           | ((u_int16_t)t_cp[1]) \
+       (s) = ((uint16_t)t_cp[0] << 8) \
+           | ((uint16_t)t_cp[1]) \
            ; \
        (cp) += NS_INT16SZ; \
 }
 
 #define IRC_NS_GET32(l, cp) { \
        const unsigned char *t_cp = (const unsigned char *)(cp); \
-       (l) = ((u_int32_t)t_cp[0] << 24) \
-           | ((u_int32_t)t_cp[1] << 16) \
-           | ((u_int32_t)t_cp[2] << 8) \
-           | ((u_int32_t)t_cp[3]) \
+       (l) = ((uint32_t)t_cp[0] << 24) \
+           | ((uint32_t)t_cp[1] << 16) \
+           | ((uint32_t)t_cp[2] << 8) \
+           | ((uint32_t)t_cp[3]) \
            ; \
        (cp) += NS_INT32SZ; \
 }
 
 #define IRC_NS_PUT16(s, cp) { \
-       u_int16_t t_s = (u_int16_t)(s); \
+       uint16_t t_s = (uint16_t)(s); \
        unsigned char *t_cp = (unsigned char *)(cp); \
        *t_cp++ = t_s >> 8; \
        *t_cp   = t_s; \
@@ -39,7 +39,7 @@
 }
 
 #define IRC_NS_PUT32(l, cp) { \
-       u_int32_t t_l = (u_int32_t)(l); \
+       uint32_t t_l = (uint32_t)(l); \
        unsigned char *t_cp = (unsigned char *)(cp); \
        *t_cp++ = t_l >> 24; \
        *t_cp++ = t_l >> 16; \