Changeset 78f0422c in mainline for uspace/srv/hid/display/test/window.c

Timestamp:

2023-10-22T17:27:09Z (16 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

133461c

Parents:

71b4444 (diff), dfb16c4 (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 C/C++ changes needed to build with newer GCC

File:

• uspace/srv/hid/display/test/window.c (modified) (2 diffs)

uspace/srv/hid/display/test/window.c

@@ -1109 +1109 @@
         PCUT_ASSERT_EQUALS(wnd->display->cursor[dcurs_arrow], wnd->cursor);
 
+        // Check that invalid cursors cannot be set: ignore enum conversions
+        // as we are out-of-bounds
+#pragma GCC diagnostic push
+#if defined(__GNUC__) && (__GNUC__ >= 10)
+#pragma GCC diagnostic ignored "-Wenum-conversion"
+#endif
         rc = ds_window_set_cursor(wnd, dcurs_limit);
         PCUT_ASSERT_ERRNO_VAL(EINVAL, rc);
@@ -1116 +1122 @@
         PCUT_ASSERT_ERRNO_VAL(EINVAL, rc);
         PCUT_ASSERT_EQUALS(wnd->display->cursor[dcurs_arrow], wnd->cursor);
+#pragma GCC diagnostic pop
 
         rc = ds_window_set_cursor(wnd, dcurs_size_lr);