Browse Source

--- Merging r23397 into '.':
U packages/aspell/src/aspell.pp
--- Merging r23480 into '.':
U packages/fcl-extra/src/daemonapp.pp
--- Merging r23725 into '.':
U rtl/unix/unixutil.pp

# revisions: 23397,23480,23725
r23397 | Almindor | 2013-01-16 05:44:49 +0100 (Wed, 16 Jan 2013) | 2 lines
Changed paths:
M /trunk/packages/aspell/src/aspell.pp

* remove old cdecl record hack, fixes linker errors with aspell on mac os x
r23480 | marco | 2013-01-21 13:53:50 +0100 (Mon, 21 Jan 2013) | 2 lines
Changed paths:
M /trunk/packages/fcl-extra/src/daemonapp.pp

* patch from Mantis #23647 Calls inherited destroy in destructor, resolves memory leak.
r23725 | marco | 2013-03-08 10:18:26 +0100 (Fri, 08 Mar 2013) | 2 lines
Changed paths:
M /trunk/rtl/unix/unixutil.pp

* fill in purpose of the unit in comment, updated copyright

git-svn-id: branches/fixes_2_6@23819 -

marco 12 years ago
parent
commit
32ee434741
3 changed files with 16 additions and 12 deletions
  1. 1 9
      packages/aspell/src/aspell.pp
  2. 1 0
      packages/fcl-extra/src/daemonapp.pp
  3. 14 3
      rtl/unix/unixutil.pp

+ 1 - 9
packages/aspell/src/aspell.pp

@@ -279,7 +279,7 @@ uses
      * NULL and token.size will be 0  }
      * NULL and token.size will be 0  }
 
 
     // internal hacky version to go around a bug regarding struct results/cdecl
     // internal hacky version to go around a bug regarding struct results/cdecl
-    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';
+    function aspell_document_checker_next_misspelling(ths:PAspellDocumentChecker):AspellToken;cdecl;external libaspell name 'aspell_document_checker_next_misspelling';
 
 
     { Returns the underlying filter class.  }
     { Returns the underlying filter class.  }
 
 
@@ -433,7 +433,6 @@ uses
     
     
   function aspell_init(const libn: ansistring): Boolean;
   function aspell_init(const libn: ansistring): Boolean;
   function aspell_loaded: Boolean;
   function aspell_loaded: Boolean;
-  function aspell_document_checker_next_misspelling(ths:PAspellDocumentChecker):AspellToken;
 
 
 implementation
 implementation
 
 
@@ -447,11 +446,4 @@ begin
   aspell_loaded := True;
   aspell_loaded := True;
 end;
 end;
 
 
-function aspell_document_checker_next_misspelling(ths: PAspellDocumentChecker
-  ): AspellToken;
-begin
-  // yup...
-  aspell_document_checker_next_misspelling := AspellToken(__aspell_document_checker_next_misspelling(ths));
-end;
-
 end.
 end.

+ 1 - 0
packages/fcl-extra/src/daemonapp.pp

@@ -929,6 +929,7 @@ destructor TCustomDaemonApplication.Destroy;
 begin
 begin
   if assigned(FEventLog) then
   if assigned(FEventLog) then
     FEventLog.Free;
     FEventLog.Free;
+  inherited Destroy;
 end;
 end;
 
 
 procedure TCustomDaemonApplication.DoRun;
 procedure TCustomDaemonApplication.DoRun;

+ 14 - 3
rtl/unix/unixutil.pp

@@ -1,8 +1,19 @@
 {
 {
     This file is part of the Free Pascal run time library.
     This file is part of the Free Pascal run time library.
-    Copyright (c) 1999-2000 by the Free Pascal development team
-
-    <What does this file>
+    Copyright (c) 1999-2013 by the Free Pascal development team
+
+    DO NOT ADD ROUTINES TO THIS FILE!
+    THE ROUTINES IN THIS FILE ARE INTERNAL AND NOT FOR END USER USAGE!
+
+    Background: This unit contains leftovers from the unix restructure that
+    shouldn't be in the interface of unit baseunix/unix, but are needed
+    in these units. (at the time routines were still being moved
+    from baseunix to unix, and unit baseunix couldn't depend on unix) 
+    
+    The routines are fairly OS independent but can't move to
+    OS independent because the lowlevel units baseunix/unix depend
+    on them. If they need to be generally accessable, copy these
+    functions to a general purpose, OS independent, supportable unit.
 
 
     See the file COPYING.FPC, included in this distribution,
     See the file COPYING.FPC, included in this distribution,
     for details about the copyright.
     for details about the copyright.