Merge pull request #70 from rhendric/master

Return to C89 compliance

Author: douglaskayama

src/MacVim/MMBackend.h

@@ -137,7 +137,7 @@ extern NSTimeInterval MMBalloonEvalInternalDelay;
 
 - (void)setAntialias:(BOOL)antialias;
 
-#ifdef FEAT_TRANSPARENCY
+#ifdef BLUR_TRANSPARENCY
 - (void)setBlurRadius:(int)radius;
 #endif
 

src/MacVim/MMBackend.m

@@ -1180,7 +1180,7 @@ - (void)setAntialias:(BOOL)antialias
     [self queueMessage:msgid data:nil];
 }
 
-#ifdef FEAT_TRANSPARENCY
+#ifdef BLUR_TRANSPARENCY
 
 - (void)setBlurRadius:(int)radius
 {

src/MacVim/MMCoreTextView.m

@@ -1076,7 +1076,8 @@ - (void)batchDrawData:(NSData *)data
         }
     }
     // fixup relative positioning
-    for( CFIndex i = 0; i < offset; ++i ) {
+    CFIndex i;
+    for( i = 0; i < offset; ++i ) {
         positions[i].x += refPos.x;
         positions[i].y += refPos.y;
     }

src/MacVim/MMVimController.m

@@ -876,10 +876,12 @@ - (void)handleMessage:(int)msgid data:(NSData *)data
         if (filenames)
             [[NSDocumentController sharedDocumentController]
                                             noteNewRecentFilePaths:filenames];
+#ifdef BLUR_TRANSPARENCY
     } else if (SetBlurRadiusMsgID == msgid) {
         const void *bytes = [data bytes];
         int radius = *((int*)bytes);
         [windowController setBlurRadius:radius];
+#endif
 
     // IMPORTANT: When adding a new message, make sure to update
     // isUnsafeMessage() if necessary!

src/MacVim/MMWindow.h

@@ -28,7 +28,9 @@
 - (void)setContentMinSize:(NSSize)size;
 - (void)setContentMaxSize:(NSSize)size;
 - (void)setContentSize:(NSSize)size;
+#ifdef BLUR_TRANSPARENCY
 - (void)setBlurRadius:(int)radius;
+#endif
 
 - (IBAction)toggleFullScreen:(id)sender;
 - (IBAction)realToggleFullScreen:(id)sender;

src/MacVim/MMWindow.m

@@ -28,9 +28,11 @@
 
 #import "MMWindow.h"
 #import "Miscellaneous.h"
-#import "CGSInternal/CGSWindow.h"
 
 
+#ifdef BLUR_TRANSPARENCY
+
+#import "CGSInternal/CGSWindow.h"
 
 typedef CGError CGSSetWindowBackgroundBlurRadiusFunction(CGSConnectionID cid, CGSWindowID wid, NSUInteger blur);
 
@@ -60,6 +62,8 @@
     return function;
 }
 
+#endif // BLUR_TRANSPARENCY
+
 
 
 @implementation MMWindow
@@ -155,6 +159,8 @@ - (void)setContentSize:(NSSize)size
     [super setContentSize:size];
 }
 
+#ifdef BLUR_TRANSPARENCY
+
 - (void)setBlurRadius:(int)radius
 {
     if (radius >= 0) {
@@ -169,6 +175,8 @@ - (void)setBlurRadius:(int)radius
     }
 }
 
+#endif // BLUR_TRANSPARENCY
+
 - (void)performClose:(id)sender
 {
     id wc = [self windowController];

src/MacVim/MMWindowController.h

@@ -46,7 +46,9 @@
     NSPoint             defaultTopLeft;
     NSToolbar           *toolbar;
     BOOL                resizingDueToMove;
+#ifdef BLUR_TRANSPARENCY
     int                 blurRadius;
+#endif
 }
 
 - (id)initWithVimController:(MMVimController *)controller;
@@ -82,7 +84,10 @@
 - (void)adjustLinespace:(int)linespace;
 - (void)liveResizeWillStart;
 - (void)liveResizeDidEnd;
+
+#ifdef BLUR_TRANSPARENCY
 - (void)setBlurRadius:(int)radius;
+#endif
 
 - (void)enterFullScreen:(int)fuoptions backgroundColor:(NSColor *)back;
 - (void)leaveFullScreen;

src/MacVim/MMWindowController.m

@@ -330,7 +330,9 @@ - (BOOL)presentWindow:(id)unused
     if (fullScreenEnabled && !fullScreenWindow)
         [decoratedWindow setAlphaValue:0];
 
+#ifdef BLUR_TRANSPARENCY
     [decoratedWindow setBlurRadius:blurRadius];
+#endif
 
     // Flag that the window is now placed on screen.  From now on it is OK for
     // code to depend on the screen state.  (Such as constraining views etc.)
@@ -721,13 +723,15 @@ - (void)liveResizeDidEnd
     }
 }
 
+#ifdef BLUR_TRANSPARENCY
 - (void)setBlurRadius:(int)radius
 {
     blurRadius = radius;
     if (windowPresented) { 
         [decoratedWindow setBlurRadius:radius];
     }
 }
+#endif
 
 - (void)enterFullScreen:(int)fuoptions backgroundColor:(NSColor *)back
 {

src/MacVim/gui_macvim.m

@@ -2360,12 +2360,12 @@ static int vimModMaskToEventModifierFlags(int mods)
 
 #endif // FEAT_BEVAL
 
-#ifdef FEAT_TRANSPARENCY
+#ifdef BLUR_TRANSPARENCY
 
     void
 gui_macvim_set_blur(int radius)
 {
     [[MMBackend sharedInstance] setBlurRadius:radius];
 }
 
-#endif // FEAT_TRANSPARENCY
+#endif // BLUR_TRANSPARENCY

src/option.c

@@ -655,7 +655,7 @@ static struct vimoption
 #endif
 			    {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
     {"blurradius",  "blur", P_NUM|P_VIM,
-#ifdef FEAT_TRANSPARENCY
+#ifdef BLUR_TRANSPARENCY
 			    (char_u *)&p_blur, PV_NONE,
 #else
 			    (char_u *)NULL, PV_NONE,
@@ -8863,7 +8863,9 @@ set_num_option(opt_idx, varp, value, errbuf, errbuflen, opt_flags)
         else if (gui.in_use)
             gui_mch_new_colors();
     }
+#endif
 
+#ifdef BLUR_TRANSPARENCY
     else if (pp == &p_blur)
     {
         if (p_blur < 0)