* make disabling/enabling a timer on windows reset it like on linux

* fix some line ending issues

git-svn-id: file:///svnroot/lcore/trunk@10 b1de8a11-f9be-4011-bde0-cc7ace90066a

diff --git a/Makefile b/Makefile
index 2926076647d5fee6a98caf5c3b750f55e391e9a2..2ac49d3cb9ee315579694ebb8d0c97e9064a3e42 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,23 @@
-all: lcoretest
-
-lcoretest: *.pas *.inc lcoretest.dpr
-       fpc -Sd -dipv6 lcoretest.dpr
-       
-clean:
-       -rm *.o
-       -rm *.ppu
-       -rm *.exe
-       -rm *.dcu
-       -rm lcoretest
-
-date := $(shell date +%Y%m%d)
-
-zip:
-       mkdir -p lcorewin32_$(date)
-       cp -a *.pas lcorewin32_$(date)
-       cp -a *.inc lcorewin32_$(date)
-       cp -a *.dpr lcorewin32_$(date)
-       cp -a Makefile lcorewin32_$(date)
-       -rm ../lcorewin32_$(date).zip
-       zip -r ../lcorewin32_$(date).zip lcorewin32_$(date)
+all: lcoretest\r
+\r
+lcoretest: *.pas *.inc lcoretest.dpr\r
+       fpc -Sd -dipv6 lcoretest.dpr\r
+       \r
+clean:\r
+       -rm *.o\r
+       -rm *.ppu\r
+       -rm *.exe\r
+       -rm *.dcu\r
+       -rm lcoretest\r
+\r
+date := $(shell date +%Y%m%d)\r
+\r
+zip:\r
+       mkdir -p lcorewin32_$(date)\r
+       cp -a *.pas lcorewin32_$(date)\r
+       cp -a *.inc lcorewin32_$(date)\r
+       cp -a *.dpr lcorewin32_$(date)\r
+       cp -a Makefile lcorewin32_$(date)\r
+       -rm ../lcorewin32_$(date).zip\r
+       zip -r ../lcorewin32_$(date).zip lcorewin32_$(date)\r

        rm -rf lcorewin32_$(date)
\ No newline at end of file
        rm -rf lcorewin32_$(date)
\ No newline at end of file

diff --git a/fd_utils.pas b/fd_utils.pas
index b07a110ce4b1824428da25b94af3375d499823d3..de89e5fedaf41cc8d7a2aa60723142ee278b278d 100755 (executable)
--- a/fd_utils.pas
+++ b/fd_utils.pas
@@ -31,11 +31,11 @@ Procedure FD_Clr(fd:longint;var fds:fdSet);
 Procedure FD_Zero(var fds:fdSet);\r
 Procedure FD_Set(fd:longint;var fds:fdSet);\r
 Function FD_IsSet(fd:longint;var fds:fdSet):boolean;\r
 Procedure FD_Zero(var fds:fdSet);\r
 Procedure FD_Set(fd:longint;var fds:fdSet);\r
 Function FD_IsSet(fd:longint;var fds:fdSet):boolean;\r

-
-{$ifdef fpc}
-  {$ifndef ver1_0}
-    {$define useinline}
-  {$endif}
+\r
+{$ifdef fpc}\r
+  {$ifndef ver1_0}\r
+    {$define useinline}\r
+  {$endif}\r

 {$endif}\r
 \r
 implementation  \r
 {$endif}\r
 \r
 implementation  \r

diff --git a/lcoregtklaz.pas b/lcoregtklaz.pas
index bbf44189a63e788ab768605d9495a0f45bc2c804..b09dbfc5f19506abdf7e38f6d74581f3ab312081 100755 (executable)
--- a/lcoregtklaz.pas
+++ b/lcoregtklaz.pas
@@ -1,7 +1,7 @@
-{ Copyright (C) 2005 Bas Steendijk and Peter Green
-  For conditions of distribution and use, see copyright notice in zlib_license.txt
-  which is included in the package
-  ----------------------------------------------------------------------------- }
+{ Copyright (C) 2005 Bas Steendijk and Peter Green\r
+  For conditions of distribution and use, see copyright notice in zlib_license.txt\r
+  which is included in the package\r
+  ----------------------------------------------------------------------------- }\r

       \r
 unit lcoregtklaz;\r
 {$mode delphi}\r
       \r
 unit lcoregtklaz;\r
 {$mode delphi}\r

diff --git a/lcoreselect.pas b/lcoreselect.pas
index bae8fe4699bc849dc175ec91e720ab3cd9a4e278..0d99f6ad900c4dd5b0d6bf63d616ed7f81a69334 100755 (executable)
--- a/lcoreselect.pas
+++ b/lcoreselect.pas
@@ -6,11 +6,11 @@
   For conditions of distribution and use, see copyright notice in zlib_license.txt\r
   which is included in the package\r
   ----------------------------------------------------------------------------- }\r
   For conditions of distribution and use, see copyright notice in zlib_license.txt\r
   which is included in the package\r
   ----------------------------------------------------------------------------- }\r

-
-{$ifdef fpc}
-  {$ifndef ver1_0}
-    {$define useinline}
-  {$endif}
+\r
+{$ifdef fpc}\r
+  {$ifndef ver1_0}\r
+    {$define useinline}\r
+  {$endif}\r

 {$endif}\r
 \r
 unit lcoreselect;\r
 {$endif}\r
 \r
 unit lcoreselect;\r


@@ -213,7 +213,7 @@ var
 \r
 var\r
   fdsrmaster , fdswmaster               : fdset      ;\r
 \r
 var\r
   fdsrmaster , fdswmaster               : fdset      ;\r

-
+\r

 function getfdsrmaster : fdset; {$ifdef fpc}inline;{$endif}\r
 begin\r
   result := fdsrmaster;\r
 function getfdsrmaster : fdset; {$ifdef fpc}inline;{$endif}\r
 begin\r
   result := fdsrmaster;\r


@@ -222,8 +222,8 @@ function getfdswmaster : fdset; {$ifdef fpc}inline;{$endif}
 begin\r
   result := fdswmaster;\r
 end;\r
 begin\r
   result := fdswmaster;\r
 end;\r

-
-
+\r
+\r

 Function  doSelect(timeOut:PTimeVal):longint;//inline;\r
 var\r
   localtimeval : ttimeval;\r
 Function  doSelect(timeOut:PTimeVal):longint;//inline;\r
 var\r
   localtimeval : ttimeval;\r

diff --git a/lloopback.pas b/lloopback.pas
index 7e26d7cef16c1df958e1bd98c88a0ef5785099b4..167aa65780f3106484823e20ad0ccc9bc03bebc8 100755 (executable)
--- a/lloopback.pas
+++ b/lloopback.pas
@@ -11,14 +11,14 @@ type
 \r
 \r
 implementation\r
 \r
 \r
 implementation\r

-uses
-{$ifdef ver1_0}
-  linux;
-{$else}
-  baseunix,unix,unixutil;  
-{$endif}
-{$i unixstuff.inc}
-
+uses\r
+{$ifdef ver1_0}\r
+  linux;\r
+{$else}\r
+  baseunix,unix,unixutil;  \r
+{$endif}\r
+{$i unixstuff.inc}\r
+\r

 constructor tlloopback.create(aowner:tcomponent);\r
 begin\r
   inherited create(aowner);\r
 constructor tlloopback.create(aowner:tcomponent);\r
 begin\r
   inherited create(aowner);\r

diff --git a/lsignal.pas b/lsignal.pas
index 49e51b24bba1c2f1f3b44a96ba9f8f046a3539f7..833c56ecbbed4918b4ca51d1327b2499638c6292 100755 (executable)
--- a/lsignal.pas
+++ b/lsignal.pas
@@ -37,7 +37,7 @@ var
   firstsignal : tlsignal;\r
   blockset : sigset;\r
   signalloopback                        : tlloopback ;\r
   firstsignal : tlsignal;\r
   blockset : sigset;\r
   signalloopback                        : tlloopback ;\r

-  
+  \r

 implementation\r
 {$include unixstuff.inc}\r
 \r
 implementation\r
 {$include unixstuff.inc}\r
 \r


@@ -193,9 +193,9 @@ end;
 initialization\r
   fillchar(blockset,sizeof(blockset),0);\r
   blockset[0] := $FFFFFFFF - (1 shl sigstop) - (1 shl sigkill) - (1 shl sigsegv);\r
 initialization\r
   fillchar(blockset,sizeof(blockset),0);\r
   blockset[0] := $FFFFFFFF - (1 shl sigstop) - (1 shl sigkill) - (1 shl sigsegv);\r

-  {$ifdef ver1_0}
-    saction.sa_mask := blockset[0];
-  {$else}
+  {$ifdef ver1_0}\r
+    saction.sa_mask := blockset[0];\r
+  {$else}\r

     saction.sa_mask := blockset;\r
   {$endif}\r
 end.\r
     saction.sa_mask := blockset;\r
   {$endif}\r
 end.\r

diff --git a/lsocket.pas b/lsocket.pas
index f4c83492a6ba62fa3c745f0746b1648fbe0220fb..c37a66aaa93b76f18075c0a247c8ca7dc5e99b83 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -630,6 +630,6 @@ end;
     result := winsock.recv(fd,buf,size,0);\r
   end;\r
 {$endif}\r
     result := winsock.recv(fd,buf,size,0);\r
   end;\r
 {$endif}\r

-
+\r

 end.\r
 \r
 end.\r
 \r

diff --git a/uint32.inc b/uint32.inc
index 897db7923309220a46f47d53a93bc636897c8252..4f2caade7d0367ec2bbb3a1b14f2e29a976089ce 100755 (executable)
--- a/uint32.inc
+++ b/uint32.inc
@@ -1,6 +1,6 @@
-{ Copyright (C) 2005 Bas Steendijk and Peter Green
-  For conditions of distribution and use, see copyright notice in zlib_license.txt
-  which is included in the package
+{ Copyright (C) 2005 Bas Steendijk and Peter Green\r
+  For conditions of distribution and use, see copyright notice in zlib_license.txt\r
+  which is included in the package\r

   ----------------------------------------------------------------------------- }\r
 type\r
   {delphi 3 and before do not have a 32 bits unsigned integer type,\r
   ----------------------------------------------------------------------------- }\r
 type\r
   {delphi 3 and before do not have a 32 bits unsigned integer type,\r

diff --git a/unixstuff.inc b/unixstuff.inc
index 76a7f5211d4aab92429f92def57133de937f1995..f8c73967a7cd99f946929d96833632a7104afc6c 100755 (executable)
--- a/unixstuff.inc
+++ b/unixstuff.inc
@@ -26,16 +26,16 @@
     {$define dup2        := fpdup2}\r
     {$ifndef ver1_9_2}\r
       {$define flock     := fpflock}\r
     {$define dup2        := fpdup2}\r
     {$ifndef ver1_9_2}\r
       {$define flock     := fpflock}\r

-      {$ifndef ver1_9_4}
-        procedure Execl(Todo:string);inline;
-       var
-         p : ppchar;
-       begin
-         p := unixutil.StringToPPChar(Todo,1);
-         if (p=nil) or (p^=nil) then exit;
-         fpexecv(p^,p);
-       end;
-      {$endif}
+      {$ifndef ver1_9_4}\r
+        procedure Execl(Todo:string);inline;\r
+       var\r
+         p : ppchar;\r
+       begin\r
+         p := unixutil.StringToPPChar(Todo,1);\r
+         if (p=nil) or (p^=nil) then exit;\r
+         fpexecv(p^,p);\r
+       end;\r
+      {$endif}\r

     {$endif}\r
     procedure gettimeofday(var tv:ttimeval);inline;\r
     begin\r
     {$endif}\r
     procedure gettimeofday(var tv:ttimeval);inline;\r
     begin\r

diff --git a/wcore.pas b/wcore.pas
index 40505efac00a016c255cc1e4c6ce2ebc01ef392b..f88aa530c59d50e8bcbda25b48d90ae2415640a7 100755 (executable)
--- a/wcore.pas
+++ b/wcore.pas
@@ -30,6 +30,9 @@ interface
     end;\r
 \r
     tltimer=class(tlcomponent)\r
     end;\r
 \r
     tltimer=class(tlcomponent)\r

+    private\r
+      fenabled : boolean;\r
+      procedure setenabled(newvalue : boolean);\r

     public\r
       ontimer:tnotifyevent;\r
       initialevent:boolean;\r
     public\r
       ontimer:tnotifyevent;\r
       initialevent:boolean;\r


@@ -37,8 +40,8 @@ interface
       prevtimer:tltimer;\r
       nexttimer:tltimer;\r
       interval:integer;        {miliseconds, default 1000}\r
       prevtimer:tltimer;\r
       nexttimer:tltimer;\r
       interval:integer;        {miliseconds, default 1000}\r

-      enabled:boolean;\r

       nextts:integer;\r
       nextts:integer;\r

+      property enabled:boolean read fenabled write setenabled;\r

       constructor create(aowner:tcomponent);override;\r
       destructor destroy;override;\r
     end;\r
       constructor create(aowner:tcomponent);override;\r
       destructor destroy;override;\r
     end;\r


@@ -96,6 +99,13 @@ end;
 \r
 {------------------------------------------------------------------------------}\r
 \r
 \r
 {------------------------------------------------------------------------------}\r
 \r

+procedure tltimer.setenabled(newvalue : boolean);\r
+begin\r
+  fenabled := newvalue;\r
+  nextts := 0;\r
+  initialdone := false;\r
+end;\r
+\r

 constructor tltimer.create;\r
 begin\r
   inherited create(AOwner);\r
 constructor tltimer.create;\r
 begin\r
   inherited create(AOwner);\r

diff --git a/zlib_license.txt b/zlib_license.txt
index a8a88f5e3a2e8361decb4ec286a988a0117ad5fa..3ec19c1a52fb62e533b42e150a512d2c7c5ee3c6 100755 (executable)
--- a/zlib_license.txt
+++ b/zlib_license.txt
@@ -1,19 +1,19 @@
-Copyright (c) 2005 Bas Steendijk and Peter Green
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the
-use of this software.
-
-Permission is granted to anyone to use this software for any purpose, including
-commercial applications, and to alter it and redistribute it freely, subject to
-the following restrictions:
-
-    1. The origin of this software must not be misrepresented; you must not
-       claim that you wrote the original software. If you use this software in a
-       product, an acknowledgment in the product documentation would be
-       appreciated but is not required.
-
-    2. Altered source versions must be plainly marked as such, and must not be
-       misrepresented as being the original software.
-
-    3. This notice may not be removed or altered from any source distribution.
+Copyright (c) 2005 Bas Steendijk and Peter Green\r
+\r
+This software is provided 'as-is', without any express or implied warranty.\r
+In no event will the authors be held liable for any damages arising from the\r
+use of this software.\r
+\r
+Permission is granted to anyone to use this software for any purpose, including\r
+commercial applications, and to alter it and redistribute it freely, subject to\r
+the following restrictions:\r
+\r
+    1. The origin of this software must not be misrepresented; you must not\r
+       claim that you wrote the original software. If you use this software in a\r
+       product, an acknowledgment in the product documentation would be\r
+       appreciated but is not required.\r
+\r
+    2. Altered source versions must be plainly marked as such, and must not be\r
+       misrepresented as being the original software.\r
+\r
+    3. This notice may not be removed or altered from any source distribution.\r