Changeset 102026 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Nov 9, 2023 12:10:01 PM (13 months ago)

Author:

vboxsync

Message:

Additions: X11/Wayland: Another attempt to fix build, bugref:10194.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• vboxwl.cpp (modified) (4 diffs)
• wayland-helper-dcp.cpp (modified) (8 diffs)

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

@@ -103 +103 @@
  * @param pvUser            User data.
  */
-static DECLCALLBACK(void) vboxwl_gtk_clipboard_read(GtkClipboard* pClipboard,
-                                                    GtkSelectionData* pSelectionData,
-                                                    gpointer pvUser)
+static void vboxwl_gtk_clipboard_read(GtkClipboard* pClipboard,
+                                      GtkSelectionData* pSelectionData,
+                                      gpointer pvUser)
 {
     guchar *pData;
@@ -257 +257 @@
  * @param pvUser            User data.
  */
-static DECLCALLBACK(void) vboxwl_gtk_clipboard_write(GtkClipboard *pClipboard,
-                                                     GtkSelectionData *pSelectionData,
-                                                     guint info, gpointer pvUser)
+static void vboxwl_gtk_clipboard_write(GtkClipboard *pClipboard,
+                                       GtkSelectionData *pSelectionData,
+                                       guint info, gpointer pvUser)
 {
     GdkAtom target = gtk_selection_data_get_target(pSelectionData);
@@ -314 +314 @@
  * @param pvUser        User data.
  */
-static DECLCALLBACK(void) vboxwl_gtk_clipboard_write_fini(GtkClipboard *pClipboard, gpointer pvUser)
+static void vboxwl_gtk_clipboard_write_fini(GtkClipboard *pClipboard, gpointer pvUser)
 {
     VBCL_LOG_CALLBACK;
@@ -402 +402 @@
  * @param   pvUser    User data.
  */
-static DECLCALLBACK(gboolean) vboxwl_gtk_watchdog(gpointer pvUser)
+static gboolean vboxwl_gtk_watchdog(gpointer pvUser)
 {
     RT_NOREF(pvUser);
-
-    //VBCL_LOG_CALLBACK;
 
     if (   g_tsGtkQuit > 0

trunk/src/VBox/Additions/x11/VBoxClient/wayland-helper-dcp.cpp

@@ -538 +538 @@
  * @param uVersion          Interface version.
  */
-static DECLCALLBACK(void) vbcl_wayland_hlp_dcp_registry_global_handler(
+static void vbcl_wayland_hlp_dcp_registry_global_handler(
     void *pvUser, struct wl_registry *pRegistry, uint32_t uName, const char *sIface, uint32_t uVersion)
 {
@@ -565 +565 @@
  * @param uName             Numeric name of the global object.
  */
-static DECLCALLBACK(void) vbcl_wayland_hlp_dcp_registry_global_remove_handler(
+static void vbcl_wayland_hlp_dcp_registry_global_remove_handler(
     void *pvUser, struct wl_registry *pRegistry, uint32_t uName)
 {
@@ -651 +651 @@
  * @param sMimeType         Mime-type of newly available clipboard data.
  */
-static DECLCALLBACK(void) vbcl_wayland_hlp_dcp_data_control_offer_offer(
+static void vbcl_wayland_hlp_dcp_data_control_offer_offer(
     void *pvUser, struct zwlr_data_control_offer_v1 *pOffer, const char *sMimeType)
 {
@@ -877 +877 @@
  * @param pOffer            Wayland Data Control Offer object.
  */
-static DECLCALLBACK(void) vbcl_wayland_hlp_dcp_data_device_data_offer(
+static void vbcl_wayland_hlp_dcp_data_device_data_offer(
     void *pvUser, struct zwlr_data_control_device_v1 *pDevice, struct zwlr_data_control_offer_v1 *pOffer)
 {
@@ -929 +929 @@
  * @param pOffer            Wayland Data Control Offer object.
  */
-static DECLCALLBACK(void) vbcl_wayland_hlp_dcp_data_device_selection(
+static void vbcl_wayland_hlp_dcp_data_device_selection(
     void *pvUser, struct zwlr_data_control_device_v1 *pDevice, struct zwlr_data_control_offer_v1 *pOffer)
 {
@@ -966 +966 @@
  * @param pOffer            Wayland Data Control Offer object.
  */
-static DECLCALLBACK(void) vbcl_wayland_hlp_dcp_data_device_primary_selection(
+static void vbcl_wayland_hlp_dcp_data_device_primary_selection(
     void *pvUser, struct zwlr_data_control_device_v1 *pDevice, struct zwlr_data_control_offer_v1 *pOffer)
 {
@@ -1001 +1001 @@
  * @param fd                A file descriptor to write clipboard content into.
  */
-static DECLCALLBACK(void) vbcl_wayland_hlp_dcp_data_source_send(
+static void vbcl_wayland_hlp_dcp_data_source_send(
     void *pvUser, struct zwlr_data_control_source_v1 *pDataSource,
     const char *sMimeType, int32_t fd)
@@ -1036 +1036 @@
  * @param pDataSource       Wayland Data Control Source object.
  */
-static DECLCALLBACK(void) vbcl_wayland_hlp_dcp_data_source_cancelled(
+static void vbcl_wayland_hlp_dcp_data_source_cancelled(
     void *pvData, struct zwlr_data_control_source_v1 *pDataSource)
 {