diff options
| author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2009-01-04 12:41:56 +0000 |
|---|---|---|
| committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2009-01-04 12:41:56 +0000 |
| commit | 024b3204af13b82369e645d03d83e799f1d7707e (patch) | |
| tree | 0fb22e352d0acdf9d19f043f48964f486e46a8e9 | |
| parent | 95295e138ccbd55f4bd8ff487de32431ee8bdbf6 (diff) | |
| download | fpc-024b3204af13b82369e645d03d83e799f1d7707e.tar.gz | |
* Placed fftw_getmem and fftw_freemem in interface section
* Removed dependency on libraries that are not directly called
* Fixed compilation of example (part of bug 12881)
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@12505 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | packages/fftw/examples/example.pas | 4 | ||||
| -rw-r--r-- | packages/fftw/src/fftw_s.pas | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/packages/fftw/examples/example.pas b/packages/fftw/examples/example.pas index e16d14a975..990ceae48f 100644 --- a/packages/fftw/examples/example.pas +++ b/packages/fftw/examples/example.pas @@ -1,6 +1,6 @@ program example; -uses fftw; +uses fftw_s; const s=128; @@ -28,4 +28,4 @@ begin fftw_destroy_plan(p); fftw_freemem(i); fftw_freemem(o); -end.
\ No newline at end of file +end. diff --git a/packages/fftw/src/fftw_s.pas b/packages/fftw/src/fftw_s.pas index 363dd0b6e6..d585121462 100644 --- a/packages/fftw/src/fftw_s.pas +++ b/packages/fftw/src/fftw_s.pas @@ -94,6 +94,10 @@ procedure fftw_destroy_plan(plan:fftw_plan_single); procedure fftw_execute(plan:fftw_plan_single); external 'fftw3f' name 'fftwf_execute'; +{$calling register} {Back to normal!} +procedure fftw_getmem(var p:pointer;size:sizeint); +procedure fftw_freemem(p:pointer);inline; + {*****************************************************************************} implementation {*****************************************************************************} @@ -101,11 +105,9 @@ procedure fftw_execute(plan:fftw_plan_single); {$LINKLIB fftw3f} {Required libraries by libfftw3} -{$LINKLIB gcc} -{$LINKLIB c} -{$LINKLIB m} - -{$calling register} {Back to normal!} +{ $LINKLIB gcc} +{ $LINKLIB c} +{ $LINKLIB m} {Better don't use fftw_malloc and fftw_free, but provide Pascal replacements.} |
