Changeset 92574f4 in mainline for uspace/lib/c/include/byteorder.h

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• uspace/lib/c/include/byteorder.h (modified) (1 diff)

uspace/lib/c/include/byteorder.h

@@ -80 +80 @@
 #endif
 
-#define htons(n)        host2uint16_t_be((n))
-#define htonl(n)        host2uint32_t_be((n))
-#define ntohs(n)        uint16_t_be2host((n))
-#define ntohl(n)        uint32_t_be2host((n))
+#define htons(n)  host2uint16_t_be((n))
+#define htonl(n)  host2uint32_t_be((n))
+#define ntohs(n)  uint16_t_be2host((n))
+#define ntohl(n)  uint32_t_be2host((n))
 
 static inline uint64_t uint64_t_byteorder_swap(uint64_t n)