ifdef mswindows instead of win32 for 64 bits support

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

diff --git a/binipstuff.pas b/binipstuff.pas
index 0b9fcb84a9e8a081833cf0b77aaecaf970398f59..93363e2b28282d8068260164ebade1cb50cf5003 100644 (file)
--- a/binipstuff.pas
+++ b/binipstuff.pas
@@ -13,7 +13,7 @@ interface
 {$include lcoreconfig.inc}\r
 \r
 uses\r
-{$ifndef win32}\r
+{$ifndef mswindows}\r
   sockets,\r
 {$endif}\r
   pgtypes;\r
@@ -25,7 +25,7 @@ uses
 \r
 const\r
   hexchars:array[0..15] of ansichar='0123456789abcdef';\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     AF_INET=2;\r
     AF_INET6=23;\r
   {$else}\r
@@ -39,7 +39,7 @@ const
 type\r
   {$ifdef ipv6}\r
     \r
-    {$ifdef win32}\r
+    {$ifdef mswindows}\r
       {$define want_Tin6_addr}\r
     {$endif}\r
     {$ifdef ver1_0}\r
@@ -70,7 +70,7 @@ type
     {$endif}\r
   end;\r
 \r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     TInetSockAddr = packed Record\r
       family:Word;\r
       port  :Word;\r

diff --git a/btime.pas b/btime.pas
index 2a4b2676797170cd5bdeab82b962d73f38ece945..df4f91ec8f301bc59de4912b0fe46f38ba395db4 100644 (file)
--- a/btime.pas
+++ b/btime.pas
@@ -12,7 +12,7 @@ unit btime;
 \r
 interface\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
 uses\r
   ltimevalstuff;\r
 {$endif}  \r
@@ -55,7 +55,7 @@ function timestrshort(i:tunixtimeint):string;    // Wed Aug 15 16:21:09 2012
 function timestriso(i:tunixtimeint):string;      // 2012-08-15 16:21:09\r
 function timestrisoutc(i:float):string;          // 2012-08-15T14:21:09.255553Z\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
 function unixtimefloat_systemtime:float;\r
 {$endif}\r
 \r
@@ -63,12 +63,12 @@ function oletounixfloat(t:float):float;
 function oletounix(t:tdatetime):tunixtimeint;\r
 function unixtoole(i:float):tdatetime;\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
 function mmtimefloat:float;\r
 function qpctimefloat:float;\r
 {$endif}\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
 procedure gettimeofday(var tv:ttimeval);\r
 {$endif}\r
 \r
@@ -726,7 +726,7 @@ end;
 \r
 procedure init;\r
 begin\r
-  {$ifdef win32}timebeginperiod(1);{$endif} //ensure stable unchanging clock\r
+  {$ifdef mswindows}timebeginperiod(1);{$endif} //ensure stable unchanging clock\r
   fillchar(mmtime_driftavg,sizeof(mmtime_driftavg),0);\r
   settimebias := 0;\r
   gettimezone;\r

diff --git a/dnsasync.pas b/dnsasync.pas
index c13f6ab717d3cc77da3e778fdd40c1d73f94e8f6..01bc2ffa71a55f993b4a6b1fd483db0aa8e917de 100644 (file)
--- a/dnsasync.pas
+++ b/dnsasync.pas
@@ -11,7 +11,7 @@ unit dnsasync;
 interface\r
 \r
 uses\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     dnswin,\r
   {$endif}\r
   lsocket,lcore,\r
@@ -39,7 +39,7 @@ type
 \r
     dnsserverids : array[0..numsock-1] of integer;\r
     startts:double;\r
-    {$ifdef win32}\r
+    {$ifdef mswindows}\r
       dwas : tdnswinasync;\r
     {$endif}\r
 \r
@@ -49,7 +49,7 @@ type
     procedure asyncprocess(socketno:integer);\r
     procedure receivehandler(sender:tobject;error:word);\r
     function sendquery(socketno:integer;const packet:tdnspacket;len:integer):boolean;\r
-    {$ifdef win32}\r
+    {$ifdef mswindows}\r
       procedure winrequestdone(sender:tobject;error:word);\r
     {$endif}\r
 \r
@@ -199,7 +199,7 @@ begin
   end;\r
   destinations[socketno] := destination;\r
 \r
-  {$ifdef ipv6}{$ifdef win32}\r
+  {$ifdef ipv6}{$ifdef mswindows}\r
   if destinations[socketno].family = AF_INET6 then if (requestaf = useaf_default) then requestaf := useaf_preferv6;\r
   {$endif}{$endif}\r
 \r
@@ -265,7 +265,7 @@ begin
 \r
   if overrideaf = useaf_default then begin\r
     {$ifdef ipv6}\r
-      {$ifdef win32}if not (usewindns and (addr = '')) then{$endif}\r
+      {$ifdef mswindows}if not (usewindns and (addr = '')) then{$endif}\r
       initpreferredmode;\r
     {$endif}\r
     requestaf := useaf;\r
@@ -273,7 +273,7 @@ begin
     requestaf := overrideaf;\r
   end;\r
 \r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     if usewindns and (addr = '') then begin\r
       dwas := tdnswinasync.create;\r
       dwas.onrequestdone := winrequestdone;\r
@@ -305,7 +305,7 @@ end;
 \r
 procedure tdnsasync.reverselookup;\r
 begin\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     if usewindns and (addr = '') then begin\r
       dwas := tdnswinasync.create;\r
       dwas.onrequestdone := winrequestdone;\r
@@ -342,7 +342,7 @@ procedure tdnsasync.cancel;
 var\r
   socketno : integer;\r
 begin\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     if assigned(dwas) then begin\r
       dwas.release;\r
       dwas := nil;\r
@@ -365,7 +365,7 @@ begin
   onrequestdone(self,0);\r
 end;\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
   procedure tdnsasync.winrequestdone(sender:tobject;error:word);\r
  \r
   begin\r

diff --git a/dnscore.pas b/dnscore.pas
index 3a9596f90317c88445b8cdb184503a73c97b9d1b..68643983ef885f0ff9d20e8d37156d67e0a5622f 100644 (file)
--- a/dnscore.pas
+++ b/dnscore.pas
@@ -62,7 +62,7 @@ interface
 \r
 uses binipstuff,classes,pgtypes,lcorernd;\r
 \r
-var usewindns : boolean = {$ifdef win32}true{$else}false{$endif};\r
+var usewindns : boolean = {$ifdef mswindows}true{$else}false{$endif};\r
 {hint to users of this unit that they should use windows dns instead.\r
 May be disabled by applications if desired. (e.g. if setting a custom\r
 dnsserverlist).\r

diff --git a/dnssync.pas b/dnssync.pas
index f6b02817fd07301b75d1d3920e7209e0912bdad8..7dedcca6ebf47874b0c90b90014ae6fb7c5f1ece 100644 (file)
--- a/dnssync.pas
+++ b/dnssync.pas
@@ -13,7 +13,7 @@ interface
   uses\r
     dnscore,\r
     binipstuff,\r
-    {$ifdef win32}\r
+    {$ifdef mswindows}\r
       winsock,\r
       windows,\r
     {$else}\r
@@ -60,12 +60,12 @@ const
 \r
 implementation\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
   uses dnswin;\r
 {$endif}\r
 \r
 \r
-{$ifndef win32}\r
+{$ifndef mswindows}\r
 {$define syncdnscore}\r
 {$endif}\r
 \r
@@ -76,7 +76,7 @@ type tdnsstatearr=array[0..numsock-1] of tdnsstate;
 {$ifdef syncdnscore}\r
 \r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
   const\r
     winsocket = 'wsock32.dll';\r
   function sendto(s: TSocket; const Buf; len, flags: Integer; var addrto: TinetSockAddrV; tolen: Integer): Integer; stdcall; external    winsocket name 'sendto';\r
@@ -87,7 +87,7 @@ type tdnsstatearr=array[0..numsock-1] of tdnsstate;
 \r
 \r
 function getts:integer;\r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
 begin\r
   result := GetTickCount and tsmask;\r
 {$else}\r
@@ -117,7 +117,7 @@ var
   a,b:integer;\r
 \r
   Src    : TInetSockAddrV;\r
-  Srcx   : {$ifdef win32}sockaddr_in{$else}TInetSockAddrV{$endif} absolute Src;\r
+  Srcx   : {$ifdef mswindows}sockaddr_in{$else}TInetSockAddrV{$endif} absolute Src;\r
   SrcLen : Integer;\r
   fromip:tbinip;\r
   fromport:ansistring;\r
@@ -153,12 +153,12 @@ begin
       makeinaddrv(biniptemp,inttostr( porttemp ),inaddrtemp);\r
 \r
       fd[a] := Socket(biniptemp.family,SOCK_DGRAM,0);\r
-      bindresult := {$ifdef win32}Not{$endif} Bind(fd[a],inAddrtemp,inaddrsize(inaddrtemp));\r
+      bindresult := {$ifdef mswindows}Not{$endif} Bind(fd[a],inAddrtemp,inaddrsize(inaddrtemp));\r
       dec(retrycount);\r
     until (retrycount <= 0) or (bindresult);\r
 \r
     If (not bindresult) Then begin\r
-      {$ifdef win32}\r
+      {$ifdef mswindows}\r
         raise Exception.create('unable to bind '+inttostr(WSAGetLastError));\r
       {$else}\r
         raise Exception.create('unable to bind '+inttostr(socketError));\r
@@ -186,7 +186,7 @@ begin
 \r
   ip := getcurrentsystemnameserverbin(id);\r
 \r
-  {$ifdef ipv6}{$ifdef win32}\r
+  {$ifdef ipv6}{$ifdef mswindows}\r
   if toaddr[socknum].family = AF_INET6 then if (useaf = 0) then useaf := useaf_preferv6;\r
   {$endif}{$endif}\r
 \r
@@ -327,7 +327,7 @@ begin
     exit; //it was an IP address, no need for dns\r
   end;\r
 \r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
   if usewindns then begin\r
     if (useaf = useaf_v4) then a := af_inet else if (useaf = useaf_v6) then a := af_inet6 else a := 0;\r
     result := winforwardlookuplist(name,a,dummy);\r
@@ -398,7 +398,7 @@ var
   numsockused:integer;\r
   state:tdnsstatearr;\r
 begin\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     if usewindns then begin\r
       result := winreverselookup(ip,dummy);\r
       exit;\r
@@ -412,7 +412,7 @@ begin
   {$endif}\r
 end;\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
   var\r
     wsadata : twsadata;\r
 \r

diff --git a/lcore.pas b/lcore.pas
index 1a2f93cb45efbb83552b07ee63c57289020786c8..c936b59d7d8376f990d3e54a8268d3cc20352b1c 100755 (executable)
--- a/lcore.pas
+++ b/lcore.pas
@@ -16,13 +16,13 @@ unit lcore;
 {$ifdef fpc}\r
   {$mode delphi}\r
 {$endif}\r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
   {$define nosignal}\r
 {$endif}\r
 interface\r
   uses\r
     sysutils,\r
-    {$ifndef win32}\r
+    {$ifndef mswindows}\r
       {$ifdef VER1_0}\r
         linux,\r
       {$else}\r
@@ -136,9 +136,9 @@ interface
 \r
       function RealSend(Data : Pointer; Len : Integer) : Integer; //added for bewarehttpd\r
 \r
-      procedure myfdclose(fd : integer); virtual;{$ifdef win32}abstract;{$endif}\r
-      function myfdwrite(fd: LongInt;const buf;size: LongInt):LongInt; virtual;{$ifdef win32}abstract;{$endif}\r
-      function myfdread(fd: LongInt;var buf;size: LongInt):LongInt; virtual;{$ifdef win32}abstract;{$endif}\r
+      procedure myfdclose(fd : integer); virtual;{$ifdef mswindows}abstract;{$endif}\r
+      function myfdwrite(fd: LongInt;const buf;size: LongInt):LongInt; virtual;{$ifdef mswindows}abstract;{$endif}\r
+      function myfdread(fd: LongInt;var buf;size: LongInt):LongInt; virtual;{$ifdef mswindows}abstract;{$endif}\r
     protected\r
       procedure dupnowatch(invalue:longint);\r
     end;\r
@@ -165,7 +165,7 @@ interface
       fontimer            : tnotifyevent      ;\r
       fenabled            : boolean           ;\r
       finterval                  : integer          ; {miliseconds, default 1000}\r
-      {$ifndef win32}\r
+      {$ifndef mswindows}\r
         procedure resettimes;\r
       {$endif}\r
 //      procedure setinitialevent(newvalue : boolean);\r
@@ -248,17 +248,17 @@ implementation
 {$ifndef nosignal}\r
   uses {sockets,}lloopback,lsignal;\r
 {$endif}\r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
   uses windows,winsock;\r
 {$endif}\r
-{$ifndef win32}\r
+{$ifndef mswindows}\r
   {$include unixstuff.inc}\r
 {$endif}\r
 \r
 \r
 {!!! added sleep call -beware}\r
 procedure sleep(i:integer);\r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
 begin\r
   windows.sleep(i);\r
 {$else}\r
@@ -395,13 +395,13 @@ begin
     eventcore.wmasterclr(fdhandleout);//fd_clr(fdhandleout,fdswmaster);\r
 \r
     if closehandles then begin\r
-      {$ifndef win32}\r
+      {$ifndef mswindows}\r
         //anyone remember why this is here? --plugwash\r
         fcntl(fdhandlein,F_SETFL,0);\r
       {$endif}\r
       myfdclose(fdhandlein);\r
       if fdhandleout <> fdhandlein then begin\r
-        {$ifndef win32}\r
+        {$ifndef mswindows}\r
           fcntl(fdhandleout,F_SETFL,0);\r
         {$endif}\r
         myfdclose(fdhandleout);\r
@@ -528,7 +528,7 @@ begin
   fdhandlein := invalue;\r
   fdhandleout := invalue;\r
   eventcore.setfdreverse(fdhandlein,self);\r
-  {$ifndef win32}\r
+  {$ifndef mswindows}\r
     fcntl(fdhandlein,F_SETFL,OPEN_NONBLOCK);\r
   {$endif}\r
   state := wsconnected;\r
@@ -561,7 +561,7 @@ begin
           internalclose(0);\r
 \r
         end else begin\r
-          {$ifdef win32}\r
+          {$ifdef mswindows}\r
           if getlasterror=WSAEWOULDBLOCK then begin\r
             //the asynchronous nature of windows messages means we sometimes\r
             //get here with the buffer full\r
@@ -569,7 +569,7 @@ begin
           end else\r
           {$endif}\r
           begin\r
-            internalclose({$ifdef win32}getlasterror{$else}linuxerror{$endif});\r
+            internalclose({$ifdef mswindows}getlasterror{$else}linuxerror{$endif});\r
           end  \r
         end;\r
       end;\r
@@ -596,7 +596,7 @@ begin
 \r
         internalclose(0);\r
       end else if (numread=-1) then begin\r
-        {$ifdef win32}\r
+        {$ifdef mswindows}\r
           //sometimes on windows we get stale messages due to the inherent delays\r
           //in the windows message queue\r
           if WSAGetLastError = wsaewouldblock then begin\r
@@ -605,7 +605,7 @@ begin
         {$endif}\r
         begin\r
           numread := 0;\r
-          internalclose({$ifdef win32}wsagetlasterror{$else}linuxerror{$endif});\r
+          internalclose({$ifdef mswindows}wsagetlasterror{$else}linuxerror{$endif});\r
         end;\r
       end else if numread > 0 then recvq.add(@tempbuf,numread);\r
     end;\r
@@ -622,7 +622,7 @@ begin
 end;\r
 \r
 procedure tlasio.flush;\r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
 type fdset = tfdset;\r
 {$endif}\r
 var\r
@@ -651,7 +651,7 @@ begin
   tlasio(sender).recvq.del(maxlongint);\r
 end;\r
 \r
-{$ifndef win32}\r
+{$ifndef mswindows}\r
   procedure tltimer.resettimes;\r
   begin\r
     gettimeofday(nextts);\r
@@ -692,7 +692,7 @@ begin
     if assigned(timerwrapperinterface) then begin\r
       timerwrapperinterface.setenabled(wrappedtimer,newvalue);\r
     end else begin\r
-      {$ifdef win32}\r
+      {$ifdef mswindows}\r
         raise exception.create('non wrapper timers are not permitted on windows');\r
       {$else}\r
         resettimes;\r
@@ -708,7 +708,7 @@ begin
     if assigned(timerwrapperinterface) then begin\r
       timerwrapperinterface.setinterval(wrappedtimer,newvalue);\r
     end else begin\r
-      {$ifdef win32}\r
+      {$ifdef mswindows}\r
         raise exception.create('non wrapper timers are not permitted on windows');\r
       {$else}\r
         resettimes;\r
@@ -867,7 +867,7 @@ begin
   if (result > 0) and assigned(onsenddata) then onsenddata(self,result);\r
   eventcore.wmasterset(fdhandleout);\r
 end;\r
-{$ifndef win32}\r
+{$ifndef mswindows}\r
   procedure tlasio.myfdclose(fd : integer);\r
   begin\r
     fdclose(fd);\r

diff --git a/lcorelocalips.pas b/lcorelocalips.pas
index aafddf727547739fa7b63312ee5c82f896c07816..d2750129f343906eee9231f4082c5a9c965f2e6f 100644 (file)
--- a/lcorelocalips.pas
+++ b/lcorelocalips.pas
@@ -51,7 +51,7 @@ function getv6localips:tbiniplist;
 \r
 function getsystemdnsservers:tbiniplist;\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
 function gethostname:ansistring;\r
 {$endif}\r
 \r
@@ -284,7 +284,7 @@ end;
 \r
 \r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
   const\r
     MAX_HOSTNAME_LEN = 132;\r
     MAX_DOMAIN_NAME_LEN = 132;\r
@@ -350,7 +350,7 @@ end;
 \r
 function getsystemdnsservers:tbiniplist;\r
 var\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     fixed_info : pfixed_info;\r
     currentdnsserver : pip_addr_string;\r
   {$else}\r
@@ -364,7 +364,7 @@ begin
 \r
   result := biniplist_new;\r
 \r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     fixed_info := callgetnetworkparams;\r
     if fixed_info = nil then exit;\r
 \r
@@ -400,7 +400,7 @@ begin
   {$endif}\r
 end;\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
 function gethostname:ansistring;\r
 var\r
     fixed_info : pfixed_info;\r

diff --git a/lcorernd.pas b/lcorernd.pas
index 3e43bb124b2d6f1dd22869f2940b619c3bd27210..648c87aa67cbb357ab4cd7d19c479dda6caa6d7d 100644 (file)
--- a/lcorernd.pas
+++ b/lcorernd.pas
@@ -132,7 +132,7 @@ implementation
 \r
 {$ifndef nolcorernd}\r
 uses\r
-  {$ifdef win32}windows,activex,{$endif}\r
+  {$ifdef mswindows}windows,activex,{$endif}\r
   {$ifdef unix}\r
     {$ifdef ver1_0}\r
       linux,\r
@@ -165,7 +165,7 @@ var
   pool:array[0..(pooldwords+seeddwords-1)] of wordtype;\r
   reseedcountdown:integer;\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
 function collect_seeding(var output;const bufsize:integer):integer;\r
 var\r
   l:packed record\r

diff --git a/lcoretest.dpr b/lcoretest.dpr
index 8be5bea02b3dc5c0e76c38751c3241c87155295d..bfba05491ace25c95a860074859a96babfd217c7 100755 (executable)
--- a/lcoretest.dpr
+++ b/lcoretest.dpr
@@ -3,7 +3,7 @@ program lcoretest;
 uses\r
   lcore,\r
   lsocket,\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     lcorewsaasyncselect in 'lcorewsaasyncselect.pas',\r
   {$else}\r
     lcoreselect,\r
@@ -14,7 +14,7 @@ uses
   dnssync\r
   //we don't actually make any use of the units below in this app, we just\r
   //include it to check if it compiles ok ;)\r
-  {$ifndef win32}\r
+  {$ifndef mswindows}\r
     ,\r
     {$ifndef nomessages}\r
       lmessages,\r
@@ -23,7 +23,7 @@ uses
     unitfork\r
   {$endif}\r
   ;\r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
   {$R *.RES}\r
 {$endif}\r
 \r

diff --git a/lsocket.pas b/lsocket.pas
index 6a1ce0be96b19ea5607b76cc35568de8abcd64a2..b493ccda8285e4c6a8ebb5a957d9aa8873d10850 100755 (executable)
--- a/lsocket.pas
+++ b/lsocket.pas
@@ -42,7 +42,7 @@ unit lsocket;
 interface\r
   uses\r
     sysutils,\r
-    {$ifdef win32}\r
+    {$ifdef mswindows}\r
       windows,winsock,\r
     {$else}\r
 \r
@@ -137,7 +137,7 @@ type
 \r
       {public in tlasio, and can't be private in both places, so should be public here. \r
       fixes delphi warning --beware}\r
-      {$ifdef win32}\r
+      {$ifdef mswindows}\r
         procedure myfdclose(fd : integer); override;\r
         function myfdwrite(fd: LongInt;const buf;size: LongInt):LongInt; override;\r
         function myfdread(fd: LongInt;var buf;size: LongInt):LongInt; override;\r
@@ -174,7 +174,7 @@ end;
 //functions whose name clashes with them) by using sockets.* and but I can't do\r
 //that anymore since in some cases connect is now provided by unixstuff.inc\r
 //hence these wrapper functions --plugwash\r
-{$ifndef win32}\r
+{$ifndef mswindows}\r
   function system_Connect(Sock: LongInt;const Addr;Addrlen: LongInt):Boolean;\r
   begin\r
     result := connect(sock,addr,addrlen);\r
@@ -236,14 +236,14 @@ begin
     //we want internalclose to act as if there was\r
     fdhandlein := -2;\r
     fdhandleout := -2;\r
-    tltask.create(taskcallconnectionfailedhandler,self,{$ifdef win32}wsagetlasterror{$else}socketerror{$endif},0);\r
+    tltask.create(taskcallconnectionfailedhandler,self,{$ifdef mswindows}wsagetlasterror{$else}socketerror{$endif},0);\r
     exit;\r
   end;\r
   try\r
     dup(a);\r
     bindsocket;\r
     if dgram then begin\r
-      {$ifndef win32}\r
+      {$ifndef mswindows}\r
         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
       {$else}\r
         SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
@@ -255,7 +255,7 @@ begin
       eventcore.wmasterclr(fdhandleout);\r
     end else begin\r
       state :=wsconnecting;\r
-      {$ifdef win32}\r
+      {$ifdef mswindows}\r
         //writeln(inaddr.inaddr.port);\r
         winsock.Connect(fdhandlein,winsock.psockaddr(@inADDR)^,getaddrsize);\r
       {$else}\r
@@ -347,7 +347,7 @@ end;
 procedure tlsocket.bindsocket;\r
 var\r
   inAddrtemp:TInetSockAddrV;\r
-  inAddrtempx:{$ifdef win32}winsock.TSockaddr{$else}TInetSockAddrV{$endif} absolute inaddrtemp;\r
+  inAddrtempx:{$ifdef mswindows}winsock.TSockaddr{$else}TInetSockAddrV{$endif} absolute inaddrtemp;\r
   inaddrtempsize:integer;\r
 begin\r
   try\r
@@ -363,9 +363,9 @@ begin
       {$ifdef ipv6}\r
         isv6socket := (inaddrtemp.inaddr.family = AF_INET6);\r
       {$endif}\r
-      If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef win32}0{$else}true{$endif} Then begin\r
+      If Bind(fdhandlein,inaddrtempx,inaddrtempsize)<> {$ifdef mswindows}0{$else}true{$endif} Then begin\r
         state := wsclosed;\r
-        lasterror := {$ifdef win32}getlasterror{$else}socketerror{$endif};\r
+        lasterror := {$ifdef mswindows}getlasterror{$else}socketerror{$endif};\r
         raise ESocketException.create('unable to bind on address '+localaddr+'#'+localport+', error '+inttostr(lasterror));\r
       end;\r
       state := wsbound;\r
@@ -380,7 +380,7 @@ end;
 \r
 procedure tlsocket.listen;\r
 var\r
-  {$ifndef win32}\r
+  {$ifndef mswindows}\r
   yes,no:longint;\r
   {$endif}\r
   socktype:integer;\r
@@ -424,13 +424,13 @@ begin
   end;\r
   {$endif}\r
 \r
-  if fdhandlein = -1 then raise ESocketException.create('unable to create socket'{$ifdef win32}+' error='+inttostr(wsagetlasterror){$endif});\r
+  if fdhandlein = -1 then raise ESocketException.create('unable to create socket'{$ifdef mswindows}+' error='+inttostr(wsagetlasterror){$endif});\r
   dupnowatch(fdhandlein); // sets up maxs and copies handle to fdhandleout among other things\r
   //eventcore.setfdreverse(fdhandlein,self); //already taken care of by dup\r
   state := wsclosed; // then set this back as it was an undesired side effect of dup\r
 \r
   try\r
-    {$ifndef win32}\r
+    {$ifndef mswindows}\r
       yes := $01010101;  {Copied this from existing code. Value is empiric,\r
                     but works. (yes=true<>0) }\r
       no := 0;\r
@@ -460,11 +460,11 @@ begin
     if not udp then begin\r
       {!!! allow custom queue length? default 5}\r
       if listenqueue = 0 then listenqueue := 5;\r
-      If {$ifdef win32}winsock.listen{$else}system_listen{$endif}(fdhandlein,listenqueue)<>{$ifdef win32}0{$else}true{$endif} Then raise\r
+      If {$ifdef mswindows}winsock.listen{$else}system_listen{$endif}(fdhandlein,listenqueue)<>{$ifdef mswindows}0{$else}true{$endif} Then raise\r
 esocketexception.create('unable to listen');\r
       state := wsListening;\r
     end else begin\r
-      {$ifndef win32}\r
+      {$ifndef mswindows}\r
         SetSocketOptions(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
       {$else}\r
         SetSockOpt(fdhandleout, SOL_SOCKET, SO_BROADCAST, 'TRUE', Length('TRUE'));\r
@@ -545,7 +545,7 @@ begin
   {$endif}\r
 \r
   FromAddrSize := Sizeof(FromAddr);\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     result := winsock.accept(fdhandlein,@fromaddr,@fromaddrsize);\r
   {$else}\r
     result := system_accept(fdhandlein,fromaddr,fromaddrsize);\r
@@ -554,7 +554,7 @@ begin
   eventcore.rmasterset(fdhandlein,true);\r
 \r
   if result = -1 then begin\r
-    raise esocketexception.create('error '+inttostr({$ifdef win32}getlasterror{$else}socketerror{$endif})+' while accepting');\r
+    raise esocketexception.create('error '+inttostr({$ifdef mswindows}getlasterror{$else}socketerror{$endif})+' while accepting');\r
   end;\r
   if result > absoloutemaxs then begin\r
     myfdclose(result);\r
@@ -571,7 +571,7 @@ var
     realdest : tinetsockaddrv;\r
     biniptemp : tbinip;\r
   {$endif}\r
-  destx : {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif};\r
+  destx : {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif};\r
 \r
 begin\r
   {$ifdef secondlistener}\r
@@ -585,15 +585,15 @@ begin
       biniptemp := inaddrvtobinip(dest);\r
       converttov6(biniptemp);\r
       destlen := makeinaddrv(biniptemp,inttostr(ntohs(dest.InAddr.port)),realdest);\r
-      destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@realdest)\r
+      destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@realdest)\r
     end else begin\r
-      destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)\r
+      destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest)\r
     end;\r
   {$else}\r
-    destx := {$ifdef win32}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest);\r
+    destx := {$ifdef mswindows}winsock.pSockAddr{$else}pInetSockAddrV{$endif}(@dest);\r
   {$endif}\r
 \r
-  result := {$ifdef win32}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx^,destlen);\r
+  result := {$ifdef mswindows}winsock.sendto{$else}system_sendto{$endif}(self.fdhandleout,data^,len,0,destx^,destlen);\r
 end;\r
 \r
 \r
@@ -601,7 +601,7 @@ function tlsocket.receivefrom(data:pointer;len:integer;var src:TInetSockAddrV;va
 var\r
   tempsrc:TInetSockAddrV;\r
   tempsrclen:integer;\r
-  srcx : {$ifdef win32}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute tempsrc;\r
+  srcx : {$ifdef mswindows}winsock.TSockAddr{$else}TInetSockAddrV{$endif} absolute tempsrc;\r
   biniptemp:tbinip;\r
 begin\r
   {$ifdef secondlistener}\r
@@ -693,7 +693,7 @@ begin
         //connectread := true;\r
         recvq.add(@tempbuf,numread);\r
       end else begin\r
-        connectionfailedhandler({$ifdef win32}wsagetlasterror{$else}linuxerror{$endif});\r
+        connectionfailedhandler({$ifdef mswindows}wsagetlasterror{$else}linuxerror{$endif});\r
         exit;\r
       end;\r
       // if things went well here we are now in the state wsconnected with data sitting in our receive buffer\r
@@ -728,9 +728,9 @@ end;
 \r
 function tlsocket.getpeername(var addr:tsockaddrin;addrlen:integer):integer;\r
 var\r
-  addrx : {$ifdef win32}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;\r
+  addrx : {$ifdef mswindows}winsock.tsockaddr{$else}tsockaddrin{$endif} absolute addr;\r
 begin\r
-  result := {$ifdef win32}winsock.getpeername{$else}system_getpeername{$endif}(self.fdhandlein,addrx,addrlen);\r
+  result := {$ifdef mswindows}winsock.getpeername{$else}system_getpeername{$endif}(self.fdhandlein,addrx,addrlen);\r
 end;\r
 \r
 procedure tlsocket.getxaddrbin(var binip:tbinip);\r
@@ -741,7 +741,7 @@ begin
   i := sizeof(addr);\r
   fillchar(addr,sizeof(addr),0);\r
 \r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     winsock.getsockname(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r
     getsocketname(self.fdhandlein,addr,i);\r
@@ -757,7 +757,7 @@ var
 begin\r
   i := sizeof(addr);\r
   fillchar(addr,sizeof(addr),0);\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     winsock.getpeername(self.fdhandlein,psockaddr(@addr)^,i);\r
   {$else}\r
     system_getpeername(self.fdhandlein,addr,i);\r
@@ -791,7 +791,7 @@ var
   i:integer;\r
 begin\r
   i := sizeof(addr);\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     winsock.getsockname(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r
@@ -807,7 +807,7 @@ var
   i:integer;\r
 begin\r
   i := sizeof(addr);\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     winsock.getpeername(self.fdhandlein,psockaddrin(@addr)^,i);\r
 \r
   {$else}\r
@@ -817,7 +817,7 @@ begin
   result := inttostr(htons(addr.InAddr.port));\r
 end;\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
   procedure tlsocket.myfdclose(fd : integer);\r
   begin\r
     closesocket(fd);\r

diff --git a/ltimevalstuff.pas b/ltimevalstuff.pas
index 93f84bbaf3616076d84514acfb60e4bf0ca183b0..5e81933d2db630812b3d16e3bb0cfef0c04dd050 100755 (executable)
--- a/ltimevalstuff.pas
+++ b/ltimevalstuff.pas
@@ -10,7 +10,7 @@
 unit ltimevalstuff;\r
 interface\r
 \r
-{$ifdef win32}\r
+{$ifdef mswindows}\r
   type\r
     ttimeval = record\r
       tv_sec : longint; \r

diff --git a/testreadtxt2.dpr b/testreadtxt2.dpr
index 3e7d0df91fd6cf7f7eccf22a002ee9a0188953b8..2feeff9e71f15dc7cc5619247d103c815f35bd07 100644 (file)
--- a/testreadtxt2.dpr
+++ b/testreadtxt2.dpr
@@ -61,7 +61,7 @@ begin
   t.destroy;\r
 \r
   \r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     //make things a little easier to test in the delphi GUI\r
     readln;\r
   {$endif}\r

diff --git a/unitwindowobject.pas b/unitwindowobject.pas
index cc7f1e1f15307898b2475eeee79589e762d28af8..1c0d32d124c5505734d27dc254e89ab323fa33b5 100644 (file)
--- a/unitwindowobject.pas
+++ b/unitwindowobject.pas
@@ -9,7 +9,7 @@ interface
 \r
 uses\r
   classes,\r
-  {$ifdef win32}\r
+  {$ifdef mswindows}\r
     windows,messages,wmessages,\r
   {$else}\r
     lmessages,\r
@@ -34,7 +34,7 @@ type
     function killtimer(id:taddrint):boolean;\r
     procedure postmessage(msg,wparam,lparam:taddrint);\r
     procedure messageloop;\r
-    {$ifdef win32}\r
+    {$ifdef mswindows}\r
       procedure processmessages; virtual;\r
       function processmessage:boolean;\r
     {$endif}  \r