From d313fd272cc944353c285e5eb9d707ca09093d2f Mon Sep 17 00:00:00 2001
From: Jonas Maebe <jonas@freepascal.org>
Date: Mon, 23 Nov 2009 16:31:02 +0000
Subject: [PATCH]   * include QuickLook units in MacOSAll   * merge:

r319 | jonas | 2009-11-23 17:29:38 +0100 (Mon, 23 Nov 2009) | 4 lines

  o two corrections by Dmitry Boyarintsev (mantis #15164):
   * PEFBinaryFormat: fixed missing semi-colon in commented-out type block
   * cblas: use {$error/errorc} instead of syntax error to report problem

git-svn-id: trunk@14259 -
---
 packages/univint/src/MacOSAll.pas        | 23 +++++++++++++++++++++++
 packages/univint/src/PEFBinaryFormat.pas |  2 +-
 packages/univint/src/cblas.pas           |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/packages/univint/src/MacOSAll.pas b/packages/univint/src/MacOSAll.pas
index 724f13269e..9475e959cc 100644
--- a/packages/univint/src/MacOSAll.pas
+++ b/packages/univint/src/MacOSAll.pas
@@ -196,6 +196,8 @@ interface
 {$i PMPrintingDialogExtensions.pas}
 {unit QDCMCommon}
 {$i QDCMCommon.pas}
+{unit QLBase}
+{$i QLBase.pas}
 {unit QTML}
 {$i QTML.pas}
 {unit QuickTimeErrors}
@@ -748,6 +750,8 @@ interface
 {$i NSLCore.pas}
 {unit OpenTransportProtocol}
 {$i OpenTransportProtocol.pas}
+{unit QLThumbnailImage}
+{$i QLThumbnailImage.pas}
 {unit Translation}
 {$i Translation.pas}
 {unit URLAccess}
@@ -854,6 +858,8 @@ interface
 {$i PMCore.pas}
 {unit QDPictToCGContext}
 {$i QDPictToCGContext.pas}
+{unit QLGenerator}
+{$i QLGenerator.pas}
 {unit Quickdraw}
 {$i Quickdraw.pas}
 {unit SCDynamicStore}
@@ -1961,6 +1967,23 @@ begin
 	flags := (flags and (not kAudioUnitParameterFlag_DisplayMask)) or displayType
 end;
 
+{implementation of unit QLGenerator}
+
+{$ifc TARGET_OS_MAC}
+
+
+function kQLGeneratorTypeID : CFUUIDRef; inline;
+begin
+	kQLGeneratorTypeID := CFUUIDGetConstantUUIDWithBytes(kCFAllocatorDefault, $5E, $2D, $96, $80, $50, $22, $40, $FA, $B8, $06, $43, $34, $96, $22, $E5, $B9)
+end;
+
+function kQLGeneratorCallbacksInterfaceID: CFUUIDRef; inline; 
+begin
+	kQLGeneratorCallbacksInterfaceID := CFUUIDGetConstantUUIDWithBytes(kCFAllocatorDefault, $86, $5A, $F5, $E0, $6D, $30, $43, $45, $95, $1B, $D3, $71, $05, $75, $4F, $2D)
+end;
+
+{$endc} {TARGET_OS_MAC}
+
 {implementation of unit Menus}
 
 {$ifc TARGET_OS_MAC}
diff --git a/packages/univint/src/PEFBinaryFormat.pas b/packages/univint/src/PEFBinaryFormat.pas
index a8783a4436..2ed2d52384 100644
--- a/packages/univint/src/PEFBinaryFormat.pas
+++ b/packages/univint/src/PEFBinaryFormat.pas
@@ -1522,7 +1522,7 @@ type
 	end;
 
 type
-	PEF2LgExportedSymbolPtr = ^PEF2LgExportedSymbol
+	PEF2LgExportedSymbolPtr = ^PEF2LgExportedSymbol;
 	PEF2LgExportedSymbol = record
 		symClass: UInt8;
 		flags: UInt8;
diff --git a/packages/univint/src/cblas.pas b/packages/univint/src/cblas.pas
index 0ad85575cf..fd87c1e8ca 100644
--- a/packages/univint/src/cblas.pas
+++ b/packages/univint/src/cblas.pas
@@ -548,7 +548,7 @@ procedure SetBLASParamErrorProc( ErrorProc: BLASParamErrorProc ); external name
   {$ifc not undefined TARGET_CPU_X86 or defined TARGET_CPU_X86_64}
 
   {$elsec}
-	   error Unknown architecture
+	   {$error Unknown architecture}
   {$endc}
 {$endc}