diff options
| author | Anatol Belski <ab@php.net> | 2014-09-20 21:37:19 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-20 21:37:19 +0200 |
| commit | fb17d6516d65c870cd47354598f0daf5d17f1df7 (patch) | |
| tree | 00a84c3085bac850cf1960ebbca2c82efca03ae4 /win32/php7ts.rc2 | |
| parent | b3aebda9eaf55706af2e21178f229a171725a168 (diff) | |
| parent | 2fc1a1dce557875d029f16d58bd3d4cd22af54fb (diff) | |
| download | php-git-fb17d6516d65c870cd47354598f0daf5d17f1df7.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
fixed copying of the struct as it's not being modified
avoid strlen usage in loop
Removes accidentally added files.
Reverts some unwanted changes
Deletes patch leftovers
Replaces php5 with php7, without whitespace changes.
Diffstat (limited to 'win32/php7ts.rc2')
| -rw-r--r-- | win32/php7ts.rc2 | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/win32/php7ts.rc2 b/win32/php7ts.rc2 new file mode 100644 index 0000000000..6c813de23c --- /dev/null +++ b/win32/php7ts.rc2 @@ -0,0 +1,61 @@ +// +// php7dllts.RC2 - resources Microsoft Visual C++ does not edit directly +// + +#ifdef APSTUDIO_INVOKED + #error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// Add manually edited resources here... +#include "../main/php_version.h" + +#define XSTRVER4(maj, min, rel, build) #maj "." #min "." #rel "." #build +#define XSTRVER3(maj, min, rel) #maj "." #min "." #rel +#define STRVER4(maj, min, rel, build) XSTRVER4(maj, min, rel, build) +#define STRVER3(maj, min, rel) XSTRVER3(maj, min, rel) + +#ifndef _MAC +//Version +VS_VERSION_INFO VERSIONINFO + FILEVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,PHP_RELEASE_VERSION + PRODUCTVERSION PHP_MAJOR_VERSION,PHP_MINOR_VERSION,PHP_RELEASE_VERSION,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "Comments", "\0" + VALUE "CompanyName", "The PHP Group\0" + VALUE "FileDescription", "PHP Script Interpreter\0" + VALUE "FileVersion", STRVER4(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION, PHP_RELEASE_VERSION) + VALUE "InternalName", "php-cgi\0" + VALUE "LegalCopyright", "Copyright © 1997-2007 The PHP Group\0" + VALUE "LegalTrademarks", "php\0" + VALUE "OriginalFilename", "php.exe\0" + VALUE "PrivateBuild", "\0" + VALUE "ProductName", "PHP Thread Safe CGI\0" + VALUE "ProductVersion", STRVER3(PHP_MAJOR_VERSION, PHP_MINOR_VERSION, PHP_RELEASE_VERSION) + VALUE "SpecialBuild", PHP_EXTRA_VERSION "\0" + VALUE "URL", "http://www.php.net" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif // !_MAC + +///////////////////////////////////////////////////////////////////////////// |