From c98dc4f95f1ee7d70eb65cbd0d2a2cfb370de4a7 Mon Sep 17 00:00:00 2001 From: Ryan Hendrickson Date: Thu, 15 Oct 2015 16:00:26 -0400 Subject: [PATCH] Move BLUR_TRANSPARENCY into its own file ... so that both Vim and MacVim can see it. I'm an idiot and didn't realize MacVim doesn't reference vim.h, so of course the #define can't be there. --- src/MacVim/MMVimController.m | 1 + src/MacVim/MMWindow.h | 1 + src/MacVim/MMWindowController.h | 1 + src/MacVim/blur.h | 3 +++ src/vim.h | 4 ++-- 5 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 src/MacVim/blur.h diff --git a/src/MacVim/MMVimController.m b/src/MacVim/MMVimController.m index 1c9bb11646..45a1e12abc 100644 --- a/src/MacVim/MMVimController.m +++ b/src/MacVim/MMVimController.m @@ -35,6 +35,7 @@ #import "Miscellaneous.h" #import "MMCoreTextView.h" #import "MMWindow.h" +#import "blur.h" static NSString *MMDefaultToolbarImageName = @"Attention"; diff --git a/src/MacVim/MMWindow.h b/src/MacVim/MMWindow.h index 30941b78d0..d55100e01b 100644 --- a/src/MacVim/MMWindow.h +++ b/src/MacVim/MMWindow.h @@ -9,6 +9,7 @@ */ #import "MacVim.h" +#import "blur.h" diff --git a/src/MacVim/MMWindowController.h b/src/MacVim/MMWindowController.h index ef54d46a1a..68889fca58 100644 --- a/src/MacVim/MMWindowController.h +++ b/src/MacVim/MMWindowController.h @@ -9,6 +9,7 @@ */ #import "MacVim.h" +#import "blur.h" diff --git a/src/MacVim/blur.h b/src/MacVim/blur.h new file mode 100644 index 0000000000..f5129dbf47 --- /dev/null +++ b/src/MacVim/blur.h @@ -0,0 +1,3 @@ +#if defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) +# define BLUR_TRANSPARENCY +#endif diff --git a/src/vim.h b/src/vim.h index 0946f2d227..4c93908dd2 100644 --- a/src/vim.h +++ b/src/vim.h @@ -1752,8 +1752,8 @@ typedef int proftime_T; /* dummy for function prototypes */ #endif /* Needs to be before option.h, which uses BLUR_TRANSPARENCY */ -#if defined(FEAT_TRANSPARENCY) && defined(MAC_OS_X_VERSION_10_5) && (MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5) -# define BLUR_TRANSPARENCY +#ifdef FEAT_TRANSPARENCY +# include "MacVim/blur.h" #endif /* Include option.h before structs.h, because the number of window-local and