Merged revisions 8931-8932,8945,8947-8948,8993,9013-9014,9034,9037,9039,9050,9056 via svnmerge from

svn+ssh://jonas@svn.freepascal.org/FPC/svn/fpc/trunk

........
r8931 | jonas | 2007-10-25 21:30:48 +0200 (Thu, 25 Oct 2007) | 3 lines

  * don't add target_info.unit_env to the unit search path
    if it's not set/empty

........
r8932 | jonas | 2007-10-25 21:41:56 +0200 (Thu, 25 Oct 2007) | 2 lines

  * test for mantis #9450 (forgot to commit earlier)

........
r8945 | jonas | 2007-10-26 14:36:38 +0200 (Fri, 26 Oct 2007) | 5 lines

  * add all implicit units (system, objpas, variants, cmem, ...) using
    their name in all lower case, so the compiler doesn't waste time
    searching for System.ppu/System.pas/System.pp/... on case-sensitive
    file systems

........
r8947 | jonas | 2007-10-26 15:48:36 +0200 (Fri, 26 Oct 2007) | 7 lines

  * updated program/script to generate all variant overload tests to merge
    most tests which have to succeed (except the extended ones, as they
    have to succeed on some and fail on other platforms) in a single file
    to speed up testing (the ivarol*.pp files can also still be compiled
    separately, but the testsuite will only compile the tnofalvarol
    program which includes them all)

........
r8948 | jonas | 2007-10-26 20:22:30 +0200 (Fri, 26 Oct 2007) | 6 lines

  * fixed bug in typed constant record parsing with variant records
    in case a variant part other than the first is initialised (the
    index of the next symbol was not adjusted, causing incorrect error
    messages in case there are some alignment bits/bytes between the
    previous and next field)

........
r8993 | jonas | 2007-10-29 20:00:15 +0100 (Mon, 29 Oct 2007) | 3 lines

  * fixed pic reference loading for non-darwin i386 platforms after
    r8657

........
r9013 | jonas | 2007-10-31 13:37:35 +0100 (Wed, 31 Oct 2007) | 3 lines

  * save/restore true/false label when secondpassing arrayconstructor
    elements (mantis #10072)

........
r9014 | jonas | 2007-10-31 16:11:13 +0100 (Wed, 31 Oct 2007) | 2 lines

  * fixed comparisons of orddefs with fourcharcodes in macpas mode + test

........
r9034 | jonas | 2007-11-01 13:45:33 +0100 (Thu, 01 Nov 2007) | 2 lines

  * fixed range errors (mantis #10079)

........
r9037 | jonas | 2007-11-01 14:31:23 +0100 (Thu, 01 Nov 2007) | 4 lines

  * fixed a_load_reg_ref: the store size has to depend on the tosize,
    not on the fromsize (fixes webtbs/tw10072, and hopefully also
    resolves mantis #8121)

........
r9039 | jonas | 2007-11-01 14:53:55 +0100 (Thu, 01 Nov 2007) | 3 lines

  * fixed some tests involving extended/double/currency after previous
    optimization

........
r9050 | jonas | 2007-11-01 17:27:41 +0100 (Thu, 01 Nov 2007) | 3 lines

  * remove procedures with var/out parameters which are supposed to
    be passed a constant expression from the overload candidates

........
r9056 | jonas | 2007-11-02 10:51:23 +0100 (Fri, 02 Nov 2007) | 2 lines

  * ifdef cpupowerpc -> ifdef cpupowerpc32

........


git-svn-id: http://svn.freepascal.org/svn/fpc/branches/fixes_2_2@9059 3ad0048d-3df7-0310-abae-a5850022a9f2

1 files changed, 5 insertions, 5 deletions

diff --git a/packages/extra/chm/chmwriter.pas b/packages/extra/chm/chmwriter.pas
index 7c52e8b6ff..4e035c8faf 100644
--- a/packages/extra/chm/chmwriter.pas
+++ b/packages/extra/chm/chmwriter.pas
@@ -186,14 +186,14 @@ begin
     //FirstPMGLChunkIndex,
     //LastPMGLChunkIndex: LongWord;
     
-    Unknown2 := NToLE(DWord(-1));
+    Unknown2 := NToLE(Longint(-1));
     //DirectoryChunkCount: LongWord;
     LanguageID := NToLE(DWord($0409));
     GUID := ITSPHeaderGUID;
     LengthAgain := NToLE(DWord($54));
-    Unknown3 := NToLE(DWord(-1));
-    Unknown4 := NToLE(DWOrd(-1));
-    Unknown5 := NToLE(DWord(-1));
+    Unknown3 := NToLE(Longint(-1));
+    Unknown4 := NToLE(Longint(-1));
+    Unknown5 := NToLE(Longint(-1));
   end;
   
   // more endian stuff
@@ -284,7 +284,7 @@ const
       UnusedSpace := NToLE(ListingBlock.FreeSpace);
       Unknown1 :=  0;
       PreviousChunkIndex := NToLE(LastListIndex);
-      NextChunkIndex := NToLE(DWord(-1)); // we update this when we write the next chunk
+      NextChunkIndex := NToLE(Longint(-1)); // we update this when we write the next chunk
     end;
     if HeaderSection1.FirstPMGLChunkIndex <= 0 then
       HeaderSection1.FirstPMGLChunkIndex := NToLE(ChunkIndex);