X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mac%2Fmacterm.c;h=4a75a0c6018be939f8a8108ca05c3be1e604e343;hb=46c00b0f381f48a9992e43e014e104015952e9da;hp=68d827607c1617dd117370a2c0ae09fde9295ed8;hpb=8719f92c1426609de7ead4a490a15d1d18875f53;p=PuTTY.git

diff --git a/mac/macterm.c b/mac/macterm.c
index 68d82760..4a75a0c6 100644
--- a/mac/macterm.c
+++ b/mac/macterm.c
@@ -115,12 +115,7 @@ void mac_startsession(Session *s)
      * Select protocol. This is farmed out into a table in a
      * separate file to enable an ssh-free variant.
      */
-    s->back = NULL;
-    for (i = 0; backends[i].backend != NULL; i++)
-	if (backends[i].protocol == s->cfg.protocol) {
-	    s->back = backends[i].backend;
-	    break;
-	}
+    s->back = backend_from_proto(s->cfg.protocol);
     if (s->back == NULL)
 	fatalbox("Unsupported protocol number found");
 
@@ -595,7 +590,7 @@ static void text_click(Session *s, EventRecord *event)
     lastwhen = TickCount();
 }
 
-void write_clip(void *cookie, wchar_t *data, int len, int must_deselect)
+void write_clip(void *cookie, wchar_t *data, int *attr, int len, int must_deselect)
 {
 #if !TARGET_API_MAC_CARBON
     Session *s = cookie;
@@ -1488,7 +1483,7 @@ void sys_cursor(void *frontend, int x, int y)
  * may want to perform additional actions on any kind of bell (for
  * example, taskbar flashing in Windows).
  */
-void beep(void *frontend, int mode)
+void do_beep(void *frontend, int mode)
 {
     if (mode != BELL_VISUAL)
 	SysBeep(30);