Merge pull request #370 from macvim-dev/fix/warnings

Suppress warnings for macOS 10.12

Author: splhack

src/MacVim/MacVim.h

@@ -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

src/MacVim/gui_macvim.m

@@ -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]

src/MacVim/qlstephen/RegexKitLite.m

@@ -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>