Bug in LMDFileCreate (LMDFiles.pas) when getting SVN-Version

BernhardGeyer

Following lines must be delete:

<<<<<<< .mine
{$IFDEF D+}
{$R+}
{$ENDIF D+}
  0, nil, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0));
=======
>>>>>>> .r8939

Alexander Hramov

We haven't such lines in LMDFiles.pas from svn.

function LMDFileCreate(const FileName: TLMDString): THandle;

begin

  {$IFDEF LMD_UNICODE}

  Result := Integer(CreateFileW(PWideChar(FileName), GENERIC_READ or GENERIC_WRITE, 0,

    nil, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0));

  {$ELSE}

  Result := Integer(Windows.CreateFile(PChar(FileName), GENERIC_READ or GENERIC_WRITE, 0,

    nil, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0));

  {$ENDIF}

end;

BernhardGeyer

Ok. So it seem that there was done a merge on my checkout-directory.