paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-10 18:38:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed compilation on CE

Browse Source 
- removed declaration of WCHAR since it is defined in systemh

git-svn-id: trunk@5135 -
This commit is contained in:
Marc Weustink 2006-10-31 22:46:09 +00:00
parent 136d3e8d46
commit 3232e59810
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/win/wininc/base.inc
View File

@ -243,7 +243,7 @@
{$ifdef UNICODE} {$ifdef UNICODE}
TBYTE = word; TBYTE = word;
TCHAR = word; TCHAR = widechar;
BCHAR = word; BCHAR = word;
{$else} {$else}
TBYTE = byte; TBYTE = byte;
@ -252,7 +252,7 @@
{$endif} {$endif}
UCHAR = byte; UCHAR = byte;
WCHAR = WideChar; // WCHAR = WideChar;
UINT = cardinal; UINT = cardinal;
ULONG = cardinal; ULONG = cardinal;

2
rtl/wince/dos.pp
View File

@ -256,7 +256,7 @@ begin
repeat repeat
if fd.dwFileAttributes and dev_attr = dev_attr then begin if fd.dwFileAttributes and dev_attr = dev_attr then begin
len:=0; len:=0;
while fd.cFileName[len] <> 0 do while fd.cFileName[len] <> #0 do
Inc(len); Inc(len);
len:=(len + 2)*SizeOf(WideChar); len:=(len + 2)*SizeOf(WideChar);
GetMem(DriveNames[i], len); GetMem(DriveNames[i], len);

2
rtl/wince/sockets.pp
View File

@ -284,7 +284,7 @@ end;
Function SocketPair(Domain,SocketType,Protocol:Longint;var Pair:TSockArray):Longint; Function SocketPair(Domain,SocketType,Protocol:Longint;var Pair:TSockArray):Longint;
begin begin
SocketPair:=fpsocketpair(domain,sockettype,protocol,@pair); SocketPair:=fpsocketpair(domain,sockettype,protocol,@pair[1]);
end; end;
{ mimic the linux fpWrite/fpRead calls for the file/text socket wrapper } { mimic the linux fpWrite/fpRead calls for the file/text socket wrapper }

6
rtl/wince/sysutils.pp
View File

@ -290,7 +290,7 @@ begin
WinToDosTime(F.FindData.ftLastWriteTime,F.Time); WinToDosTime(F.FindData.ftLastWriteTime,F.Time);
f.size:=F.FindData.NFileSizeLow; f.size:=F.FindData.NFileSizeLow;
f.attr:=F.FindData.dwFileAttributes; f.attr:=F.FindData.dwFileAttributes;
PWideCharToString(@F.FindData.cFileName, f.Name); PWideCharToString(@F.FindData.cFileName[0], f.Name);
Result:=0; Result:=0;
end; end;
@ -631,7 +631,7 @@ begin
nil, nil,
ErrorCode, ErrorCode,
0, 0,
@MsgBuffer, { This function allocs the memory } PWideChar(@MsgBuffer), { This function allocs the memory (in this case you pass a PPwidechar)}
0, 0,
nil); nil);
while (len > 0) and (MsgBuffer[len - 1] <= #32) do while (len > 0) and (MsgBuffer[len - 1] <= #32) do
@ -737,7 +737,7 @@ begin
WinCEMajorVersion:=versionInfo.dwMajorVersion; WinCEMajorVersion:=versionInfo.dwMajorVersion;
WinCEMinorVersion:=versionInfo.dwMinorVersion; WinCEMinorVersion:=versionInfo.dwMinorVersion;
WinCEBuildNumber:=versionInfo.dwBuildNumber; WinCEBuildNumber:=versionInfo.dwBuildNumber;
i:=WideToAnsiBuf(@versioninfo.szCSDVersion, -1, @WinCECSDVersion[1], SizeOf(WinCECSDVersion) - 1); i:=WideToAnsiBuf(@versioninfo.szCSDVersion[0], -1, @WinCECSDVersion[1], SizeOf(WinCECSDVersion) - 1);
if i <> 0 then if i <> 0 then
WinCECSDVersion[0]:=chr(i - 1); WinCECSDVersion[0]:=chr(i - 1);
end; end;

4
rtl/wince/wininc/base.inc
View File

@ -256,7 +256,7 @@
SIZE_T = Cardinal; //+winnt SIZE_T = Cardinal; //+winnt
{$ifdef UNICODE} {$ifdef UNICODE}
TBYTE = word; TBYTE = word;
TCHAR = word; TCHAR = widechar;
BCHAR = word; BCHAR = word;
{$else} {$else}
TBYTE = byte; TBYTE = byte;
@ -265,7 +265,7 @@
{$endif} {$endif}
UCHAR = byte; //windef UCHAR = byte; //windef
WCHAR = WideChar; //winnt // WCHAR = WideChar; //winnt
UINT = Cardinal; //windef UINT = Cardinal; //windef
ULONG = Cardinal; //windef ULONG = Cardinal; //windef