Merged revisions 10250 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
r10250 | Almindor | 2008-02-08 17:58:41 +0100 (Pi, 08 feb 2008) | 2 lines

* use the qword hack only on linux x86_64 (others would fail)

........

git-svn-id: branches/fixes_2_2@10251 -

packages/aspell/src/aspell.pp

@@ -418,7 +418,7 @@ uses
      * NULL and token.size will be 0  }
 
     // internal hacky version to go around a bug regarding struct results/cdecl
-    function __aspell_document_checker_next_misspelling(ths:PAspellDocumentChecker):QWord;cdecl;external libaspell name 'aspell_document_checker_next_misspelling';
+    function __aspell_document_checker_next_misspelling(ths:PAspellDocumentChecker):{$IFDEF CPU64}{$IFDEF LINUX}QWord{$ELSE}AspellToken{$ENDIF}{$ELSE}AspellToken{$ENDIF};cdecl;external libaspell name 'aspell_document_checker_next_misspelling';
 
     { Returns the underlying filter class.  }
 
@@ -824,7 +824,7 @@ var
        * NULL and token.size will be 0  }
 
   // hack around struct/cdecl problem
-  __aspell_document_checker_next_misspelling: function(ths:PAspellDocumentChecker):QWord;cdecl;
+  __aspell_document_checker_next_misspelling: function(ths:PAspellDocumentChecker):{$IFDEF CPU64}{$IFDEF LINUX}QWord{$ELSE}AspellToken{$ENDIF}{$ELSE}AspellToken{$ENDIF};cdecl;
 
       { Returns the underlying filter class.  }