Changeset 101881 in vbox for trunk/src/VBox/Additions

Timestamp:

Nov 6, 2023 4:29:36 PM (15 months ago)

Author:

vboxsync

Message:

Additions: X11/Wayland: fix building issues with older gcc (4.1.2), bugref:10194.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• vboxwl.cpp (modified) (1 diff)
• wayland-helper-ipc.h (modified) (2 diffs)
• wayland-helper.h (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/vboxwl.cpp

@@ -70 +70 @@
 /** A session ID which will be specified in communication messages
  * with VBoxClient instance. */
-static uint32_t g_uSessionId = 0;;
+static uint32_t g_uSessionId = 0;
 
 /** One-shot session type. */

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-ipc.h

@@ -264 +264 @@
                      *
                      * @returns IPRT status code.
-                     * @param   flow            Pointer to selected IPC flow.
+                     * @param   pFlow           Pointer to selected IPC flow.
                      * @param   hIpcSession     IPC connection handle.
                      */
-                    int flow(const flow_t *flow, RTLOCALIPCSESSION hIpcSession)
+                    int flow(const flow_t *pFlow, RTLOCALIPCSESSION hIpcSession)
                     {
                         int idx = 0;
@@ -273 +273 @@
 
                         while (   RT_SUCCESS(rc)
-                               && flow[idx].enmCmd != CMD_MAX)
+                               && pFlow[idx].enmCmd != CMD_MAX)
                         {
-                            rc = select_fn(flow[idx].enmCmd, flow[idx].fDirection, hIpcSession);
+                            rc = select_fn(pFlow[idx].enmCmd, pFlow[idx].fDirection, hIpcSession);
                             idx++;
                         }

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper.h

@@ -90 +90 @@
     VBCL_WL_CLIPBOARD_SESSION_TYPE_ANNOUNCE_TO_HOST,
     /** Copy clipboard data to the host. */
-    VBCL_WL_CLIPBOARD_SESSION_TYPE_COPY_TO_HOST,
+    VBCL_WL_CLIPBOARD_SESSION_TYPE_COPY_TO_HOST
 } vbcl_wl_session_type_t;