diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-09 22:25:47 -0500 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-08-09 22:25:47 -0500 |
commit | eaa7ee2e0bbca40ba3173c4304f81957e8964291 (patch) | |
tree | 4f793aa48a5080aedc94ce6e519c3b86708f2b88 /tqtinterface/qt4/src/3rdparty/zlib/win32 | |
parent | 79a9d7a46a20d4a0923bc06fc471fdc2176ef865 (diff) | |
download | experimental-eaa7ee2e0bbca40ba3173c4304f81957e8964291.tar.gz experimental-eaa7ee2e0bbca40ba3173c4304f81957e8964291.zip |
rename the following methods:
tqfind find
tqreplace replace
tqcontains contains
Diffstat (limited to 'tqtinterface/qt4/src/3rdparty/zlib/win32')
-rw-r--r-- | tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt | 12 | ||||
-rw-r--r-- | tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx | 4 | ||||
-rw-r--r-- | tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt b/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt index 4951c48..1746a95 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt +++ b/tqtinterface/qt4/src/3rdparty/zlib/win32/DLL_FAQ.txt @@ -29,7 +29,7 @@ in the zlib distribution, or at the following location: * The calling convention of functions is "C" (CDECL). * The ZLIB1.DLL binary is linked to MSVCRT.DLL. - The archive in which ZLIB1.DLL is bundled tqcontains compiled + The archive in which ZLIB1.DLL is bundled contains compiled test programs that must run with a valid build of ZLIB1.DLL. It is recommended to download the prebuilt DLL from the zlib web site, instead of building it yourself, to avoid potential @@ -79,14 +79,14 @@ in the zlib distribution, or at the following location: longer dependents on it. - 3. Can I build ZLIB.DLL from the new zlib sources, and tqreplace + 3. Can I build ZLIB.DLL from the new zlib sources, and replace an old ZLIB.DLL, that was built from zlib-1.1.4 or earlier? - In principle, you can do it by assigning calling convention keywords to the macros ZEXPORT and ZEXPORTVA. In practice, it depends on what you mean by "an old ZLIB.DLL", because the old DLL exists in several mutually-incompatible versions. - You have to tqfind out first what kind of calling convention is + You have to find out first what kind of calling convention is being used in your particular ZLIB.DLL build, and to use the same one in the new build. If you don't know what this is all about, you might be better off if you would just leave the old @@ -110,7 +110,7 @@ in the zlib distribution, or at the following location: - Although exporting symbols by ordinal is a little faster, it is risky. Any single glitch in the maintenance or use of the - DEF file that tqcontains the ordinals can result in incompatible + DEF file that contains the ordinals can result in incompatible builds and frustrating crashes. Simply put, the benefits of exporting symbols by ordinal do not justify the risks. @@ -119,7 +119,7 @@ in the zlib distribution, or at the following location: exist in every DLL, and even if the dynamic linking performed at the DLL startup is searching for names, ordinals serve as hints, for a faster name lookup. However, if the DEF file - tqcontains ordinals, the Microsoft linker automatically builds + contains ordinals, the Microsoft linker automatically builds an implib that will cause the executables linked to it to use those ordinals, and not the names. It is interesting to notice that the GNU linker for Win32 does not suffer from this @@ -331,7 +331,7 @@ in the zlib distribution, or at the following location: CYGWIN1.DLL, and it is distributed under the name CYGZ.DLL. -14. May I include additional pieces of code that I tqfind useful, +14. May I include additional pieces of code that I find useful, link them in ZLIB1.DLL, and export them? - No. A legitimate build of ZLIB1.DLL must not include code diff --git a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx index f40c58c..7b08424 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx +++ b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.emx @@ -15,9 +15,9 @@ CC=gcc -Zwin32 CFLAGS=-MMD -O3 $(BUTT) -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ -Wstrict-prototypes -Wmissing-prototypes -# If cp.exe is available, tqreplace "copy /Y" with "cp -fp" . +# If cp.exe is available, replace "copy /Y" with "cp -fp" . CP=copy /Y -# If gnu install.exe is available, tqreplace $(CP) with ginstall. +# If gnu install.exe is available, replace $(CP) with ginstall. INSTALL=$(CP) # The default value of RM is "rm -f." If "rm.exe" is found, comment out: RM=del diff --git a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc index 895193e..62a8430 100644 --- a/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc +++ b/tqtinterface/qt4/src/3rdparty/zlib/win32/Makefile.gcc @@ -46,7 +46,7 @@ RC = windres RCFLAGS = --define GCC_WINDRES CP = cp -fp -# If GNU install is available, tqreplace $(CP) with install. +# If GNU install is available, replace $(CP) with install. INSTALL = $(CP) RM = rm -f |