xserver: Branch 'master'

[GitLab Mirror]

 os/WaitFor.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit b306df5a6060beea82b5157c3603593527b220b0
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Sep 9 16:21:46 2024 -0700

    os: NextDPMSTimeout: mark intentional fallthroughs in switch
    
    The comment at the top of the function tells humans the fallthroughs
    are intentional, but gcc doesn't parse that.
    
    Clears 3 -Wimplicit-fallthrough warnings from gcc 14.1
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1716>

diff --git a/os/WaitFor.c b/os/WaitFor.c
index dac1b83b4..7f64c336b 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -415,13 +415,13 @@ NextDPMSTimeout(INT32 timeout)
     switch (DPMSPowerLevel) {
     case DPMSModeOn:
         DPMS_CHECK_TIMEOUT(DPMSStandbyTime)
-
+        /* fallthrough */
     case DPMSModeStandby:
         DPMS_CHECK_TIMEOUT(DPMSSuspendTime)
-
+        /* fallthrough */
     case DPMSModeSuspend:
         DPMS_CHECK_TIMEOUT(DPMSOffTime)
-
+        /* fallthrough */
     default:                   /* DPMSModeOff */
         return 0;
     }