Changeset 423 for trunk/Packages/Common/UCommon.pas

Timestamp:

Apr 25, 2022, 6:01:01 PM (2 years ago)

Author:

chronos

Message:

• Modified: Do not use explicit mode delphi directive as it is already set in project.
• Modified: Use UNIX instead of LINUX for conditional code to work also on FreeBSD.

File:

• trunk/Packages/Common/UCommon.pas (modified) (8 diffs)

trunk/Packages/Common/UCommon.pas

@@ -1 +1 @@
 unit UCommon;
 
-{$mode delphi}
-
 interface
 
 uses
-  {$ifdef Windows}Windows,{$endif}
-  {$ifdef Linux}baseunix,{$endif}
+  {$IFDEF WINDOWS}Windows,{$ENDIF}
+  {$IFDEF UNIX}baseunix,{$ENDIF}
   Classes, SysUtils, StrUtils, Dialogs, Process, LCLIntf,
   FileUtil; //, ShFolder, ShellAPI;
@@ -35 +33 @@
   DLLHandle1: HModule;
 
-{$IFDEF Windows}
+{$IFDEF WINDOWS}
   GetUserNameEx: procedure (NameFormat: DWORD;
     lpNameBuffer: LPSTR; nSize: PULONG); stdcall;
@@ -302 +300 @@
 end;
 
-{$IFDEF Windows}
+{$IFDEF WINDOWS}
 function GetUserName: string;
 const
@@ -323 +321 @@
   end;
 end;
-{$endif}
+{$ENDIF}
 
 function ComputerName: string;
-{$ifdef mswindows}
+{$IFDEF WINDOWS}
 const
  INFO_BUFFER_SIZE = 32767;
@@ -341 +339 @@
   end;
 end;
-{$endif}
-{$ifdef unix}
+{$ENDIF}
+{$IFDEF UNIX}
 var
   Name: UtsName;
@@ -349 +347 @@
   Result := Name.Nodename;
 end;
-{$endif}
-
-{$ifdef windows}
+{$ENDIF}
+
+{$IFDEF WINDOWS}
 function LoggedOnUserNameEx(Format: TUserNameFormat): string;
 const
@@ -429 +427 @@
 procedure LoadLibraries;
 begin
-  {$IFDEF Windows}
+  {$IFDEF WINDOWS}
   DLLHandle1 := LoadLibrary('secur32.dll');
   if DLLHandle1 <> 0 then
@@ -440 +438 @@
 procedure FreeLibraries;
 begin
-  {$IFDEF Windows}
+  {$IFDEF WINDOWS}
   if DLLHandle1 <> 0 then FreeLibrary(DLLHandle1);
   {$ENDIF}