Dominique Leuenberger
de200b6f0e
+ Added 0001-Remove-unused-DEPRECATED-macro.patch
+ Added 0002-Conditionally-define-g_info-macro.patch
+ Added 0003-Add-kuid_t-kgid_t-compatibility-layer.patch
+ Added 0004-Use-new-link-helpers.patch
+ Added 0005-Update-hgfs-file-operations-for-newer-kernels.patch
+ Added 0006-Fix-vmxnet-module-on-kernels-3.16.patch
+ Added 0007-Fix-vmhgfs-module-on-kernels-3.16.patch
+ Added 0008-Fix-segfault-in-vmhgfs.patch
+ Droped g_info_redefine.patch (now named
0002-Conditionally-define-g_info-macro.patch).
- Enable building of KMP packages.
- Fix bashisms in preun script.
- Do not generate timestamps in the doxygen docs.
OBS-URL: https://build.opensuse.org/package/show/Virtualization:VMware/open-vm-tools?expand=0&rev=267
35 lines
1.0 KiB
Diff
35 lines
1.0 KiB
Diff
From 9a38a9da20c898c4c21e84e1cf4f97c5b63f6a87 Mon Sep 17 00:00:00 2001
|
|
From: "Scott M. Kroll" <skroll@gmail.com>
|
|
Date: Mon, 14 Jul 2014 11:25:10 -0400
|
|
Subject: [PATCH 2/5] Conditionally define g_info macro
|
|
|
|
* Some versions of GLib define this macro.
|
|
---
|
|
open-vm-tools/lib/include/vmware/tools/log.h | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/open-vm-tools/lib/include/vmware/tools/log.h b/open-vm-tools/lib/include/vmware/tools/log.h
|
|
index 526b7c2..fa7deb4 100644
|
|
--- a/open-vm-tools/lib/include/vmware/tools/log.h
|
|
+++ b/open-vm-tools/lib/include/vmware/tools/log.h
|
|
@@ -121,6 +121,7 @@
|
|
# define FUNC __FUNCTION__
|
|
#endif
|
|
|
|
+#ifndef g_info
|
|
/*
|
|
*******************************************************************************
|
|
* g_info -- */ /**
|
|
@@ -135,7 +136,7 @@
|
|
*/
|
|
|
|
#define g_info(fmt, ...) g_log(G_LOG_DOMAIN, G_LOG_LEVEL_INFO, fmt, ## __VA_ARGS__)
|
|
-
|
|
+#endif
|
|
|
|
/*
|
|
*******************************************************************************
|
|
--
|
|
2.0.1
|
|
|