--- Merging r41268 into '.':

U    rtl/objpas/sysutils/syshelpo.inc
--- Recording mergeinfo for merge of r41268 into '.':
 U   .
--- Merging r41274 into '.':
U    rtl/wince/wininc/defines.inc
--- Recording mergeinfo for merge of r41274 into '.':
 G   .

# revisions: 41268,41274
deleted corrected entry 411268 Invalid stream operation
r41268 | marco | 2019-02-09 18:12:20 +0100 (Sat, 09 Feb 2019) | 3 lines
Changed paths:
   M /trunk/rtl/objpas/sysutils/syshelpo.inc

 * tohexstring calls inttohex instead of hexstr. Hexstr has fixed number of 
  digits, inttohex a minimum number. Mantis #35015
deleted corrected entry 411268 Invalid stream operation
r41274 | marco | 2019-02-10 10:20:54 +0100 (Sun, 10 Feb 2019) | 2 lines
Changed paths:
   M /trunk/rtl/wince/wininc/defines.inc

 * add reg_qword. Feedback on #35050

git-svn-id: branches/fixes_3_2@41299 -

rtl/objpas/sysutils/syshelpo.inc

@@ -49,13 +49,13 @@ Function TORDINALHELPER.ToHexString(const AMinDigits: Integer): string;
 overload; inline;
 
 begin
-  Result:=HexStr(Self,AMinDigits);
+  Result:=IntToHex(Self,AMinDigits);
 end;
 
 Function TORDINALHELPER.ToHexString: string; overload; inline;
 
 begin
-  Result:=HexStr(Self,SizeOf(TORDINALTYPE)*2);
+  Result:=IntToHex(Self,SizeOf(TORDINALTYPE)*2);
 end;
 
 Function TORDINALHELPER.ToSingle: Single; inline;

rtl/wince/wininc/defines.inc

@@ -2225,6 +2225,7 @@
      REG_LINK = 6;
      REG_MULTI_SZ = 7;
      REG_NONE = 0;
+     REG_QWORD = 11;
      REG_RESOURCE_LIST = 8;
      REG_RESOURCE_REQUIREMENTS_LIST = 10;
      REG_SZ = 1;