updated for version 7.1-278

diff --git a/src/gui_mac.c b/src/gui_mac.c
index 901e81f402aa9f1dd5cf03bcbd9a7367b1ff42e7..77006a73a0a2b23a80b2fe4d2907a02ac6188e68 100644 (file)
--- a/src/gui_mac.c
+++ b/src/gui_mac.c
@@ -3037,13 +3037,11 @@ receiveHandler(WindowRef theWindow, void *handlerRefCon, DragRef theDrag)
 gui_mch_init(void)
 {
     /* TODO: Move most of this stuff toward gui_mch_init */
-    Rect       windRect;
-    MenuHandle pomme;
+    Rect           windRect;
+    MenuHandle     pomme;
     EventHandlerRef mouseWheelHandlerRef;
-#ifdef USE_CARBONKEYHANDLER
     EventTypeSpec   eventTypeSpec;
-#endif
-    ControlRef rootControl;
+    ControlRef     rootControl;
 
     if (Gestalt(gestaltSystemVersion, &gMacSystemVersion) != noErr)
        gMacSystemVersion = 0x1000; /* TODO: Default to minimum sensible value */

diff --git a/src/version.c b/src/version.c
index 78788ec07dcfbbdc7874ceaf06a3fc555fc40d10..a397e8acc7e493a712370b132a2b3a834f259083 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    278,
 /**/
     277,
 /**/