Attachment 150735 Details for Bug 196108 – Fix emulators/open-vm-tools(-nox11) build with clang 3.5.0

[patch] Fix emulators/open-vm-tools(-nox11) build with clang 3.5.0

emulators__open-vm-tools-fix-clang350-build-1.diff (text/plain), 1.33 KB, created by Dimitry Andric on 2014-12-18 20:33:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2014-12-18 20:33:08 UTC

Size: 1.33 KB

patch

obsolete

>Index: emulators/open-vm-tools/files/patch-toolbox__toolboxcmd-shrink.c
>===================================================================
>--- emulators/open-vm-tools/files/patch-toolbox__toolboxcmd-shrink.c	(revision 0)
>+++ emulators/open-vm-tools/files/patch-toolbox__toolboxcmd-shrink.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- toolbox/toolboxcmd-shrink.c.orig	2013-09-23 17:51:10.000000000 +0200
>++++ toolbox/toolboxcmd-shrink.c	2014-11-25 17:57:44.000000000 +0100
>+@@ -391,7 +391,7 @@ ShrinkDoWipeAndShrink(char *mountPoint, 
>+     * Verify that wiping/shrinking are permitted before going through with the
>+     * wiping operation.
>+     */
>+-   if (!ShrinkGetWiperState() == WIPER_ENABLED && !Wiper_IsWipeSupported(part)) {
>++   if (ShrinkGetWiperState() != WIPER_ENABLED && !Wiper_IsWipeSupported(part)) {
>+       g_debug("%s cannot be wiped / shrunk\n", mountPoint);
>+       ToolsCmd_PrintErr("%s",
>+                         SU_(disk.shrink.disabled, SHRINK_DISABLED_ERR));
>
>Property changes on: emulators/open-vm-tools/files/patch-toolbox__toolboxcmd-shrink.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 196108: 150735