Changeset 95c675b in mainline for abi/include/abi/fourcc.h

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (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:

Merge mainline

File:

• abi/include/abi/fourcc.h (modified) (1 diff)

abi/include/abi/fourcc.h

@@ -36 +36 @@
 #define ABI_FOURCC_H_
 
-#include "../../../common.h"
+#include <stdint.h>
 
 #define FOURCC(a, b, c, d) \
-        (((UINT32_T) (a)) | (((UINT32_T) (b)) << 8) | \
-            (((UINT32_T) (c)) << 16) | (((UINT32_T) (d)) << 24))
+        (((uint32_t) (a)) | (((uint32_t) (b)) << 8) | \
+            (((uint32_t) (c)) << 16) | (((uint32_t) (d)) << 24))
 
 #define CC_COMPACT(a) \
-        ((UINT32_T) (a) & 0x7f)
+        ((uint32_t) (a) & 0x7f)
 
 #define FOURCC_COMPACT(a, b, c, d) \