From 281f280eb145f0260ed3d70e1f7c245f5f283a9b Mon Sep 17 00:00:00 2001 From: Bjorn Winckler Date: Mon, 28 Sep 2009 21:26:39 +0200 Subject: [PATCH] Disable MacVim plugins for now The supporting files for CTGradient and RBSplitView causes several warnings when compiling for 64 bit. Since nobody uses MacVim plugins I have decided to disable them instead of having to support these files (although these warnings are easy enough to fix for anybody interested). --- src/MacVim/CTGradient.m | 3 +++ src/MacVim/MacVim.h | 5 +++-- src/MacVim/RBSplitSubview.m | 2 ++ src/MacVim/RBSplitView.m | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/MacVim/CTGradient.m b/src/MacVim/CTGradient.m index 471c4aae7b..4056fcf60e 100644 --- a/src/MacVim/CTGradient.m +++ b/src/MacVim/CTGradient.m @@ -7,6 +7,7 @@ // Released into public domain on 4/10/08. // // Version: 1.8 +#ifdef MM_ENABLE_PLUGINS #import "CTGradient.h" @@ -1266,3 +1267,5 @@ void resolveHSV(float *color1, float *color2) //H value may be undefined (i.e. g } @end + +#endif // MM_ENABLE_PLUGINS diff --git a/src/MacVim/MacVim.h b/src/MacVim/MacVim.h index f8315de622..c0dec58041 100644 --- a/src/MacVim/MacVim.h +++ b/src/MacVim/MacVim.h @@ -13,9 +13,10 @@ // -// Enable support for MacVim plugins (not to be confused with Vim plugins!). +// Uncomment to enable support for MacVim plugins (not to be confused with Vim +// plugins!). // -#define MM_ENABLE_PLUGINS +//#define MM_ENABLE_PLUGINS // Taken from /usr/include/AvailabilityMacros.h diff --git a/src/MacVim/RBSplitSubview.m b/src/MacVim/RBSplitSubview.m index 97748bfab3..60a01ded57 100644 --- a/src/MacVim/RBSplitSubview.m +++ b/src/MacVim/RBSplitSubview.m @@ -6,6 +6,7 @@ // Copyright 2004-2006 Rainer Brockerhoff. // Some Rights Reserved under the Creative Commons Attribution License, version 2.5, and/or the MIT License. // +#ifdef MM_ENABLE_PLUGINS #import "RBSplitView.h" #import "RBSplitViewPrivateDefines.h" @@ -925,3 +926,4 @@ static animationData* currentAnimation = NULL; @end +#endif // MM_ENABLE_PLUGINS diff --git a/src/MacVim/RBSplitView.m b/src/MacVim/RBSplitView.m index 057645a91a..0e11d5bdc3 100644 --- a/src/MacVim/RBSplitView.m +++ b/src/MacVim/RBSplitView.m @@ -6,6 +6,7 @@ // Copyright 2004-2006 Rainer Brockerhoff. // Some Rights Reserved under the Creative Commons Attribution License, version 2.5, and/or the MIT License. // +#ifdef MM_ENABLE_PLUGINS #import "RBSplitView.h" #import "RBSplitViewPrivateDefines.h" @@ -1732,3 +1733,4 @@ static inline float fMAX(float a,float b) { @end +#endif // MM_ENABLE_PLUGINS