Skip to content

Suppress warnings for macOS 10.12 #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
splhack merged 1 commit into from
Oct 2, 2016
Merged

Suppress warnings for macOS 10.12 #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/MacVim/MacVim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
// Deprecated constants in 10.12 SDK
# define NSAlertStyleCritical NSCriticalAlertStyle
# define NSAlertStyleInformational NSInformationalAlertStyle
# define NSAlertStyleWarning NSWarningAlertStyle
# define NSCompositingOperationSourceOver NSCompositeSourceOver
# define NSControlSizeRegular NSRegularControlSize
Expand Down
4 changes: 2 additions & 2 deletions src/MacVim/gui_macvim.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,9 +1507,9 @@
// Ensure no data is on the output queue before presenting the dialog.
gui_macvim_force_flush();

int style = NSInformationalAlertStyle;
int style = NSAlertStyleInformational;
if (VIM_WARNING == type) style = NSAlertStyleWarning;
else if (VIM_ERROR == type) style = NSCriticalAlertStyle;
else if (VIM_ERROR == type) style = NSAlertStyleCritical;

NSMutableDictionary *attr = [NSMutableDictionary
dictionaryWithObject:[NSNumber numberWithInt:style]
Expand Down
2 changes: 2 additions & 0 deletions src/MacVim/qlstephen/RegexKitLite.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/

#define OSSPINLOCK_USE_INLINED 1

#include <CoreFoundation/CFBase.h>
#include <CoreFoundation/CFArray.h>
#include <CoreFoundation/CFString.h>
Expand Down