summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-10-02 12:55:52 +0000
committerjonas <jonas@3ad0048d-3df7-0310-abae-a5850022a9f2>2009-10-02 12:55:52 +0000
commitdcb381287b689aefd8c2f2f64d5ffaf911cc7f21 (patch)
tree115d4c01af83294fed829b5e96cbb3ed55995056
parent6af3c2bcddce0172c007be1f06b0e07f86e77338 (diff)
downloadfpc-dcb381287b689aefd8c2f2f64d5ffaf911cc7f21.tar.gz
* fixes for go32v2 compilation by John Lee (approved by Tomas)
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@13791 3ad0048d-3df7-0310-abae-a5850022a9f2
-rw-r--r--packages/fcl-process/src/dummy/process.inc7
-rw-r--r--utils/fppkg/buildfppkg.pp7
2 files changed, 12 insertions, 2 deletions
diff --git a/packages/fcl-process/src/dummy/process.inc b/packages/fcl-process/src/dummy/process.inc
index d3145d0ab0..73311f2ffa 100644
--- a/packages/fcl-process/src/dummy/process.inc
+++ b/packages/fcl-process/src/dummy/process.inc
@@ -2,10 +2,13 @@
Dummy process.inc
}
-{$if defined(VER2_2) or defined(VER2_3_1)}
+{
+ prevent compilation error for the versions mentioned below
+}
+{$if defined(VER2_4) or defined(VER2_5_1)}
{$warning Temporary workaround - unit does nothing}
{$else}
-{$fatal Proper implementation of TProcess needed}
+{$fatal Proper implementation of TProcess for version of this target needed}
{$endif}
procedure TProcess.CloseProcessHandles;
diff --git a/utils/fppkg/buildfppkg.pp b/utils/fppkg/buildfppkg.pp
index 41fae2a0e9..99d9efcfc8 100644
--- a/utils/fppkg/buildfppkg.pp
+++ b/utils/fppkg/buildfppkg.pp
@@ -2,8 +2,15 @@ unit buildfppkg;
interface
+ {
+ these units cause compilation errors on targets eg go32v2 for which fppkg
+ not implemented properly, so remove them by ifdef. jl Aug 2009
+ }
+
+{$ifndef go32v2}
uses
fprepos,fpxmlrep,pkgoptions,pkgglobals,pkgmessages,pkghandler,pkgmkconv,pkgdownload,pkgfpmake,pkgcommands,pkgrepos,pkgwget,pkglnet;
+{$endif}
implementation