pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'hotfix/v8.3.3' (#275) from hotfix/v8.3.3 into release/v9.0.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/core/pulls/275
This commit is contained in:
Oleg Korshul
2025-04-07 11:57:57 +00:00
parent 21451d83e4 c84f2a11d5
commit 81be9c1c1f
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DesktopEditor/cximage/png/pngpriv.h
View File

@ -332,6 +332,7 @@
* DBL_MAX Maximum floating point number (can be set to an arbitrary value)
*/
# include <float.h>
# include <math.h>
# if (defined(__MWERKS__) && defined(macintosh)) || defined(applec) || \
defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)

3
MsBinaryFile/XlsFile/Format/Auxiliary/HelpFunc.h
View File

@ -87,8 +87,7 @@ namespace STR
};
namespace XMLSTUFF
{;
{
const std::wstring name2sheet_name(std::wstring name, const std::wstring prefix);
const std::wstring xti_indexes2sheet_name(const short tabFirst, const short tabLast, std::vector<std::wstring>& names, const std::wstring prefix = L"");
unsigned short sheetsnames2ixti(std::wstring name);

1
OfficeUtils/src/zlib-1.2.11/zutil.h
View File

@ -131,6 +131,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
#endif
#if defined(MACOS) || defined(TARGET_OS_MAC)
#include <stdio.h>
# define OS_CODE 7
# ifndef Z_SOLO
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os