From e4d2e8bd00115a49685ad8518537e8b2bafb3420 Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Fri, 17 Jul 2015 19:39:44 +0200
Subject: [PATCH] fix build-toolchain, make Dialog sample compile with another
 Universal Headers version

---
 Samples/Dialog/dialog.c | 3 ++-
 build-toolchain.sh      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Samples/Dialog/dialog.c b/Samples/Dialog/dialog.c
index 984c5f3086..99cfff5864 100644
--- a/Samples/Dialog/dialog.c
+++ b/Samples/Dialog/dialog.c
@@ -19,6 +19,7 @@
 
 #include <Quickdraw.h>
 #include <Dialogs.h>
+#include <Fonts.h>
 
 QDGlobals qd;
 
@@ -52,7 +53,7 @@ int main()
     Rect box;
 
     GetDialogItem(dlg, 2, &type, &itemH, &box);
-    SetDialogItem(dlg, 2, type, (Handle) NewUserItemUPP(&ButtonFrameProc), &box);
+	SetDialogItem(dlg, 2, type, (Handle) NewUserItemProc(&ButtonFrameProc), &box);
 
     ControlHandle cb, radio1, radio2;
     GetDialogItem(dlg, 5, &type, &itemH, &box);
diff --git a/build-toolchain.sh b/build-toolchain.sh
index ed1db5fb85..0dd4442324 100644
--- a/build-toolchain.sh
+++ b/build-toolchain.sh
@@ -62,7 +62,7 @@ cd ..
 sh "$SRC/prepare-headers.sh" "$SRC/CIncludes" toolchain/m68k-unknown-elf/include
 
 mkdir -p toolchain/RIncludes
-cp '$SRC/RIncludes/*.r' toolchain/RIncludes/
+cp $SRC/RIncludes/*.r toolchain/RIncludes/
 
 mkdir -p build-host
 cd build-host