summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsergei <sergei@3ad0048d-3df7-0310-abae-a5850022a9f2>2012-04-25 11:26:00 +0000
committersergei <sergei@3ad0048d-3df7-0310-abae-a5850022a9f2>2012-04-25 11:26:00 +0000
commit2968e64ef5d276ddf5e94adda78cad391cb030f9 (patch)
tree4e33e887541af11a1c38b59871009ba5892d86cb
parentd751cb9011be6e77f945256c2be7bebb410c1f29 (diff)
downloadfpc-2968e64ef5d276ddf5e94adda78cad391cb030f9.tar.gz
* Fixed 64-bit compilation warnings (Integer -> PtrUInt)
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@21034 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--packages/winunits-jedi/src/jwalpmapi.pas2
-rw-r--r--packages/winunits-jedi/src/jwawindns.pas8
-rw-r--r--packages/winunits-jedi/src/jwawinuser.pas2
3 files changed, 6 insertions, 6 deletions
diff --git a/packages/winunits-jedi/src/jwalpmapi.pas b/packages/winunits-jedi/src/jwalpmapi.pas
index e99851361f..adb11d5d22 100644
--- a/packages/winunits-jedi/src/jwalpmapi.pas
+++ b/packages/winunits-jedi/src/jwalpmapi.pas
@@ -1527,7 +1527,7 @@ end;
function ObjData(const x: TRsvpObjHdr): Pointer;
begin
- Result := Pointer(Integer(@x) + SizeOf(x));
+ Result := Pointer(PtrUInt(@x) + SizeOf(x));
end;
function Style_is_Wildcard(p: DWORD): Boolean;
diff --git a/packages/winunits-jedi/src/jwawindns.pas b/packages/winunits-jedi/src/jwawindns.pas
index d04877d66e..7051e4e85f 100644
--- a/packages/winunits-jedi/src/jwawindns.pas
+++ b/packages/winunits-jedi/src/jwawindns.pas
@@ -1890,7 +1890,7 @@ end;
function DNS_HEADER_FLAGS(pHead: PDNS_HEADER): WORD;
begin
- Result := PWORD(Integer(pHead) + SizeOf(WORD))^;
+ Result := PWORD(@pHead^.Flags)^;
end;
procedure DNS_BYTE_FLIP_HEADER_COUNTS(var pHeader: PDNS_HEADER);
@@ -1915,17 +1915,17 @@ end;
function IS_WORD_ALIGNED(P: Pointer): BOOL;
begin
- Result := (Integer(P) and 1) = 0;
+ Result := (PtrUInt(P) and 1) = 0;
end;
function IS_DWORD_ALIGNED(P: Pointer): BOOL;
begin
- Result := (Integer(P) and 3) = 0;
+ Result := (PtrUInt(P) and 3) = 0;
end;
function IS_QWORD_ALIGNED(P: Pointer): BOOL;
begin
- Result := (Integer(P) and 7) = 0;
+ Result := (PtrUInt(P) and 7) = 0;
end;
function DNS_TEXT_RECORD_LENGTH(StringCount: Integer): Integer;
diff --git a/packages/winunits-jedi/src/jwawinuser.pas b/packages/winunits-jedi/src/jwawinuser.pas
index bb7cd74a48..72ea05084a 100644
--- a/packages/winunits-jedi/src/jwawinuser.pas
+++ b/packages/winunits-jedi/src/jwawinuser.pas
@@ -11935,7 +11935,7 @@ end;
function RAWINPUT_ALIGN(x: Pointer): Pointer;
begin
- Result := Pointer((Integer(x) + SizeOf(DWORD) - 1) and not (SizeOf(DWORD) - 1));
+ Result := Pointer((PtrUInt(x) + (SizeOf(DWORD) - 1)) and not (SizeOf(DWORD) - 1));
end;
function NEXTRAWINPUTBLOCK(ptr: PRawInput): PRawInput;