Changeset 90c340fb in mainline

Timestamp:

2017-10-26T23:44:55Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

37e8c4a

Parents:

e4c8e3cf

Message:

Convert two "old style" static asserts.

Location:

uspace/lib

Files:

• drv/generic/remote_usb.c (modified) (2 diffs)
• usb/include/usb/request.h (modified) (2 diffs)

uspace/lib/drv/generic/remote_usb.c

@@ -35 +35 @@
 
 #include <async.h>
+#include <assert.h>
 #include <macros.h>
 #include <errno.h>
@@ -169 +170 @@
 }
 
-int static_assert[sizeof(sysarg_t) >= 4 ? 1 : -1];
+static_assert(sizeof(sysarg_t) >= 4);
+
 typedef union {
         uint8_t arr[sizeof(sysarg_t)];

uspace/lib/usb/include/usb/request.h

@@ -37 +37 @@
 
 #include <stdint.h>
+#include <assert.h>
 
 /** Standard device request. */
@@ -107 +108 @@
 } __attribute__ ((packed)) usb_device_request_setup_packet_t;
 
-int assert[(sizeof(usb_device_request_setup_packet_t) == 8) ? 1: -1];
+static_assert(sizeof(usb_device_request_setup_packet_t) == 8);
 
 int usb_request_needs_toggle_reset(