diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:04:08 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 22:04:08 -0600 |
commit | e02e31c8b9d854cd62cbe9799228f6e08e882773 (patch) | |
tree | 53303c981d0b20e03c5a2fc8e959fa74adcb90d1 /src/3rdparty/zlib/win32 | |
parent | 143f194af098d44bf0dd1ebb29e59f30ce48d523 (diff) | |
download | tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.tar.gz tqt3-e02e31c8b9d854cd62cbe9799228f6e08e882773.zip |
Sync with latest script
Diffstat (limited to 'src/3rdparty/zlib/win32')
-rw-r--r-- | src/3rdparty/zlib/win32/DLL_FAQ.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/3rdparty/zlib/win32/DLL_FAQ.txt b/src/3rdparty/zlib/win32/DLL_FAQ.txt index 725b32bd0..1746a951c 100644 --- a/src/3rdparty/zlib/win32/DLL_FAQ.txt +++ b/src/3rdparty/zlib/win32/DLL_FAQ.txt @@ -35,7 +35,7 @@ in the zlib distribution, or at the following location: web site, instead of building it yourself, to avoid potential incompatibilities that could be introduced by your compiler and build settings. If you do build the DLL yourself, please - make sure that it complies with all the above retquirements, + make sure that it complies with all the above requirements, and it runs with the precompiled test programs, bundled with the original ZLIB1.DLL distribution. @@ -46,7 +46,7 @@ in the zlib distribution, or at the following location: 2. Why did you change the name of the DLL to ZLIB1.DLL? What happened to the old ZLIB.DLL? - - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, retquired + - The old ZLIB.DLL, built from zlib-1.1.4 or earlier, required compilation settings that were incompatible to those used by a static build. The DLL settings were supposed to be enabled by defining the macro ZLIB_DLL, before including "zlib.h". @@ -176,8 +176,8 @@ in the zlib distribution, or at the following location: (GNAT) and Fortran (GNU G77), have C bindings implemented initially on Unix, and relying on the C calling convention. On the other hand, the pre- .Net versions of Microsoft Visual - Basic retquire STDCALL, while Borland Delphi prefers, although - it does not retquire, FASTCALL. + Basic require STDCALL, while Borland Delphi prefers, although + it does not require, FASTCALL. In fairness to all possible uses of zlib outside the C programming language, we choose the default "C" convention. @@ -213,7 +213,7 @@ in the zlib distribution, or at the following location: 9. If my application uses ZLIB1.DLL, should I link it to MSVCRT.DLL? Why? - - It is not retquired, but it is recommended to link your + - It is not required, but it is recommended to link your application to MSVCRT.DLL, if it uses ZLIB1.DLL. The executables (.EXE, .DLL, etc.) that are involved in the |