Skip to content

Commit

Permalink
emulators/open-vm-tools: Prepare for glib 2.68.3
Browse files Browse the repository at this point in the history
PR:	256200
  • Loading branch information
neelchauhan committed Aug 3, 2021
1 parent 94630ac commit 42dfc13
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 0 deletions.
12 changes: 12 additions & 0 deletions emulators/open-vm-tools/files/patch-lib_include_tracer.hh
@@ -0,0 +1,12 @@
--- lib/include/tracer.hh.orig 2021-08-03 01:45:08 UTC
+++ lib/include/tracer.hh
@@ -28,9 +28,7 @@

#include "vm_basic_defs.h"

-extern "C" {
#include "glib.h"
-}


#ifdef VMX86_DEVEL
11 changes: 11 additions & 0 deletions emulators/open-vm-tools/files/patch-lib_pollGtk_pollGtk.c
@@ -0,0 +1,11 @@
--- lib/pollGtk/pollGtk.c.orig 2021-08-03 01:31:55 UTC
+++ lib/pollGtk/pollGtk.c
@@ -1485,7 +1485,7 @@ Poll_InitGtk(void)
PollLockingAlwaysEnabled,
};

- if (g_once_init_enter(&inited)) {
+ if (g_once_init_enter((gsize *)&inited)) {
gsize didInit = 1;
Poll_InitWithImpl(&gtkImpl);
g_once_init_leave(&inited, didInit);
@@ -0,0 +1,16 @@
--- services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp.orig 2021-08-03 01:43:48 UTC
+++ services/plugins/dndcp/dndGuest/dndCPTransportGuestRpc.hpp
@@ -31,13 +31,11 @@

#include "dnd.h"

-extern "C" {
#ifdef VMX86_TOOLS
#include "vmware/tools/guestrpc.h"
#else
#include "guest_rpc.h"
#endif
-}

#define GUEST_RPC_CMD_STR_DND "dnd.transport"
#define GUEST_RPC_CMD_STR_CP "copypaste.transport"
@@ -0,0 +1,14 @@
--- services/plugins/dndcp/dndcp.cpp.orig 2021-08-03 01:47:47 UTC
+++ services/plugins/dndcp/dndcp.cpp
@@ -31,11 +31,9 @@

#define G_LOG_DOMAIN "dndcp"

-extern "C" {
#include "vmware/guestrpc/tclodefs.h"
#include "vmware/tools/plugin.h"
#include "vmware/tools/utils.h"
-}

#include <string.h>
#include "copyPasteDnDWrapper.h"

0 comments on commit 42dfc13

Please sign in to comment.