From 8f1076967cb242f2660d2b6b3831fd6f3f3ba84c Mon Sep 17 00:00:00 2001 From: vincents Date: Tue, 13 Sep 2011 07:52:19 +0000 Subject: [PATCH] printers: fixed compilation (Duplicate identifier "PrinterName") on Mac OS X after revision 32243 #6d24d264ef git-svn-id: trunk@32310 - --- components/printers/carbon/carbonprinters.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/printers/carbon/carbonprinters.inc b/components/printers/carbon/carbonprinters.inc index eed645549f..d8d3b4ad65 100644 --- a/components/printers/carbon/carbonprinters.inc +++ b/components/printers/carbon/carbonprinters.inc @@ -188,7 +188,7 @@ procedure TCarbonPrinter.BeginEnumPrinters(Lst: TStrings); var P: PMPrinter; I, C: CFIndex; - PrinterName: String; + NewPrinterName: String; begin if OSError(PMServerCreatePrinterList(kPMServerLocal, FPrinterArray), Self, 'DoEnumPrinters', 'PMServerCreatePrinterList') then Exit; @@ -197,13 +197,13 @@ begin for I := 0 to C - 1 do begin P := CFArrayGetValueAtIndex(FPrinterArray, I); - PrinterName := CFStringToStr(PMPrinterGetName(P)); + NewPrinterName := CFStringToStr(PMPrinterGetName(P)); //DebugLn(DbgS(I) + ' ' + PrinterName); - if PrinterName = FDefaultPrinter then - Lst.InsertObject(0, PrinterName, TObject(I)) + if NewPrinterName = FDefaultPrinter then + Lst.InsertObject(0, NewPrinterName, TObject(I)) else - Lst.AddObject(PrinterName, TObject(I)); + Lst.AddObject(NewPrinterName, TObject(I)); end; end;