Dominique Leuenberger
22ea044bb3
- Add gcc9-static-inline.patch: Fix static inline when building with gcc9. OBS-URL: https://build.opensuse.org/request/show/737498 OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=381
75 lines
2.5 KiB
Diff
75 lines
2.5 KiB
Diff
diff --git a/open-vm-tools/lib/include/vmware/tools/plugin.h b/open-vm-tools/lib/include/vmware/tools/plugin.h
|
|
index f9acc6a29..deefd1f3d 100644
|
|
--- a/open-vm-tools/lib/include/vmware/tools/plugin.h
|
|
+++ b/open-vm-tools/lib/include/vmware/tools/plugin.h
|
|
@@ -290,7 +290,7 @@ typedef struct ToolsAppCtx {
|
|
*
|
|
* @return TRUE if COM is initialized when the function returns.
|
|
*/
|
|
-G_INLINE_FUNC gboolean
|
|
+static inline gboolean
|
|
ToolsCore_InitializeCOM(ToolsAppCtx *ctx)
|
|
{
|
|
if (!ctx->comInitialized) {
|
|
diff --git a/open-vm-tools/lib/include/vmware/tools/threadPool.h b/open-vm-tools/lib/include/vmware/tools/threadPool.h
|
|
index 3f2082b3e..5880fbcff 100644
|
|
--- a/open-vm-tools/lib/include/vmware/tools/threadPool.h
|
|
+++ b/open-vm-tools/lib/include/vmware/tools/threadPool.h
|
|
@@ -91,7 +91,7 @@ typedef struct ToolsCorePool {
|
|
*******************************************************************************
|
|
*/
|
|
|
|
-G_INLINE_FUNC ToolsCorePool *
|
|
+static inline ToolsCorePool *
|
|
ToolsCorePool_GetPool(ToolsAppCtx *ctx)
|
|
{
|
|
ToolsCorePool *pool = NULL;
|
|
@@ -123,7 +123,7 @@ ToolsCorePool_GetPool(ToolsAppCtx *ctx)
|
|
*******************************************************************************
|
|
*/
|
|
|
|
-G_INLINE_FUNC guint
|
|
+static inline guint
|
|
ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
|
|
ToolsCorePoolCb cb,
|
|
gpointer data,
|
|
@@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
|
|
*******************************************************************************
|
|
*/
|
|
|
|
-G_INLINE_FUNC void
|
|
+static inline void
|
|
ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
|
|
guint taskId)
|
|
{
|
|
@@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
|
|
*******************************************************************************
|
|
*/
|
|
|
|
-G_INLINE_FUNC gboolean
|
|
+static inline gboolean
|
|
ToolsCorePool_StartThread(ToolsAppCtx *ctx,
|
|
const gchar *threadName,
|
|
ToolsCorePoolCb cb,
|
|
diff --git a/open-vm-tools/lib/include/vmware/tools/utils.h b/open-vm-tools/lib/include/vmware/tools/utils.h
|
|
index f65745906..a3292d5c0 100644
|
|
--- a/open-vm-tools/lib/include/vmware/tools/utils.h
|
|
+++ b/open-vm-tools/lib/include/vmware/tools/utils.h
|
|
@@ -51,15 +51,6 @@
|
|
# include <sys/time.h>
|
|
#endif
|
|
|
|
-
|
|
-/* Work around a glib limitation: it doesn't set G_INLINE_FUNC on Win32. */
|
|
-#if defined(G_PLATFORM_WIN32)
|
|
-# if defined(G_INLINE_FUNC)
|
|
-# undef G_INLINE_FUNC
|
|
-# endif
|
|
-# define G_INLINE_FUNC static __inline
|
|
-#endif
|
|
-
|
|
#ifndef ABS
|
|
# define ABS(x) (((x) >= 0) ? (x) : -(x))
|
|
#endif
|
|
|