github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: Fixed problem with Win32 GetTimeFormat name clash

Browse source
This commit is contained in:
Mirek Fidler 2024-01-08 14:42:03 +01:00
parent 3be824bcfd
commit f19d41198c
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
uppsrc/Core/TimeDate.cpp
View file

@ -78,6 +78,16 @@ void SetDateFormat(const char *fmt)
strncpy(s_date_format_main, fmt, 63);
}
#ifdef PLATFORM_WIN32 // resolve nameclash with win32 API
#ifdef GetDateFormatA
#undef GetDateFormatA
#endif
#ifdef GetDateFormatW
#undef GetDateFormatW
#endif
#endif
String GetDateFormat()
{
return *s_date_format_thread ? s_date_format_thread : s_date_format_main;

10
uppsrc/Core/TimeDate.h
View file

@ -80,6 +80,16 @@ void SetDateFormat(const char *fmt);
void SetDateScan(const char *scan);
void SetDateFilter(const char *seps);
#ifdef PLATFORM_WIN32 // resolve nameclash with win32 API
#ifdef GetDateFormatA
#undef GetDateFormatA
#endif
#ifdef GetDateFormatW
#undef GetDateFormatW
#endif
#endif
String GetDateFormat();
const char *StrToDate(const char *fmt, Date& d, const char *s, Date def = Null);

2
uppsrc/GLDraw/Text.cpp
View file

@ -27,7 +27,7 @@ struct sGlyphTextureMaker : LRUCache<GLTexture>::Maker {
Color color;
virtual String Key() const {
StringBuffer h;
String h;
RawCat(h, chr);
RawCat(h, font);
RawCat(h, angle);