added mini libc for darwin

git-svn-id: trunk@8608 -
This commit is contained in:
mattias 2006-01-23 19:13:02 +00:00
parent 28067deac6
commit b41729a19d
7 changed files with 84 additions and 13 deletions

1
.gitattributes vendored
View File

@ -240,6 +240,7 @@ components/printers/unix/cupsprinters.inc svneol=native#text/pascal
components/printers/unix/cupsprinters_h.inc svneol=native#text/pascal components/printers/unix/cupsprinters_h.inc svneol=native#text/pascal
components/printers/unix/cupsprndialogs.inc svneol=native#text/pascal components/printers/unix/cupsprndialogs.inc svneol=native#text/pascal
components/printers/unix/jobsimglist.lrs svneol=native#text/pascal components/printers/unix/jobsimglist.lrs svneol=native#text/pascal
components/printers/unix/minicupslibc.pas svneol=native#text/plain
components/printers/unix/printerprop.lrs svneol=native#text/pascal components/printers/unix/printerprop.lrs svneol=native#text/pascal
components/printers/unix/selectprinter.lrs svneol=native#text/pascal components/printers/unix/selectprinter.lrs svneol=native#text/pascal
components/printers/unix/udlgprintersjobs.lfm svneol=native#text/plain components/printers/unix/udlgprintersjobs.lfm svneol=native#text/plain

View File

@ -25,7 +25,7 @@
<License Value="LGPL <License Value="LGPL
"/> "/>
<Version Build="2"/> <Version Build="2"/>
<Files Count="26"> <Files Count="27">
<Item1> <Item1>
<Filename Value="printersdlgs.lrs"/> <Filename Value="printersdlgs.lrs"/>
<Type Value="LRS"/> <Type Value="LRS"/>
@ -135,6 +135,10 @@
<Filename Value="unix/cupsprndialogs.inc"/> <Filename Value="unix/cupsprndialogs.inc"/>
<Type Value="Include"/> <Type Value="Include"/>
</Item26> </Item26>
<Item27>
<Filename Value="unix/minicupslibc.pas"/>
<UnitName Value="minicupslibc"/>
</Item27>
</Files> </Files>
<Type Value="RunAndDesignTime"/> <Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="2"> <RequiredPkgs Count="2">

View File

@ -7,7 +7,7 @@ unit Printer4Lazarus;
interface interface
uses uses
PrintersDlgs, OSPrinters, LazarusPackageIntf; PrintersDlgs, OSPrinters, MiniCUPSLibc, LazarusPackageIntf;
implementation implementation

View File

@ -51,10 +51,15 @@ interface
uses uses
Classes, SysUtils, dynlibs, Classes, SysUtils, dynlibs,
{$ifdef UseLibC} {$ifdef UseLibC}
LibC; {$IFDEF darwin}
miniCupsLibc
{$ELSE}
Libc
{$ENDIF}
{$else} {$else}
baseunix, unix, sockets; baseunix, unix, sockets
{$endif} {$endif}
;
{$PACKRECORDS C} {$PACKRECORDS C}

View File

@ -0,0 +1,51 @@
{
*****************************************************************************
* *
* See the file COPYING.LCL, included in this distribution, *
* for details about the copyright. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. *
* *
*****************************************************************************
}
unit MiniCUPSLibc;
{$mode objfpc}{$H+}
interface
const
clib = 'c';
Type
Time_t = longint;
TTime_T = Time_t;
Ptime_t = ^TTime_T;
type
Ptm = ^tm;
tm = record
tm_sec : longint;
tm_min : longint;
tm_hour : longint;
tm_mday : longint;
tm_mon : longint;
tm_year : longint;
tm_wday : longint;
tm_yday : longint;
tm_isdst : longint;
case boolean of
false : (tm_gmtoff : longint;tm_zone : Pchar);
true : (__tm_gmtoff : longint;__tm_zone : Pchar);
end;
function __time(__timer:Ptime_t):time_t;cdecl;external clib name 'time';
function localtime(__timer:Ptime_t):Ptm;cdecl;external clib name 'localtime';
function localtime(var __timer : ttime_t):Ptm;cdecl;external clib name 'localtime';
implementation
end.

View File

@ -43,9 +43,14 @@ uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ExtCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ExtCtrls,
Printers,cupsPrinters,Buttons,ComCtrls,StdCtrls, Printers,cupsPrinters,Buttons,ComCtrls,StdCtrls,
{$IFNDEF DYNLINK} {$IFNDEF DYNLINK}
Cups, cups_ipp,Libc Cups, cups_ipp,
{$ELSE} {$ELSE}
CUPSDyn,LibC CUPSDyn,
{$ENDIF}
{$IFDEF darwin}
miniCupsLibc,
{$ELSE}
Libc,
{$ENDIF} {$ENDIF}
; ;

View File

@ -3,8 +3,6 @@
------------ ------------
***************************************************************************** *****************************************************************************
* * * *
* This file is part of the Lazarus Component Library (LCL) *
* *
* See the file COPYING.LCL, included in this distribution, * * See the file COPYING.LCL, included in this distribution, *
* for details about the copyright. * * for details about the copyright. *
* * * *
@ -43,8 +41,8 @@ interface
uses uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls, Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
Buttons, ExtCtrls, Spin, MaskEdit, ComCtrls,LCLType, Buttons, ExtCtrls, Spin, MaskEdit, ComCtrls, LCLType,
Printers, OsPrinters in '../osprinters.pas', CUPSDyn,libc; Printers, OsPrinters in '../osprinters.pas', CUPSDyn;
type type
@ -129,14 +127,21 @@ function LocalToGMTDateTime(aDate : TDateTime) : TDateTime;
function LapseLocalToGMT : integer; function LapseLocalToGMT : integer;
implementation implementation
uses udlgpropertiesprinter;
uses
{$IFDEF darwin}
miniCupsLibc,
{$ELSE}
Libc,
{$ENDIF}
uDlgPropertiesPrinter;
Type Type
THackCUPSPrinter=Class(TCUPSPrinter); THackCUPSPrinter = Class(TCUPSPrinter);
{----------- Utile date/time convertion ------------} {----------- Utile date/time convertion ------------}
//Return the lapse time in second //Return the lapse time in second
//beetween locatime and gmt time with daylight //beetween localtime and gmt time with daylight
function LapseLocalToGMT : integer; function LapseLocalToGMT : integer;
var TT : ttime_t; var TT : ttime_t;
LOC: PTm; LOC: PTm;