interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Decided to keep attrstr.h for now; removed extern "C" hack from attrstr.hpp on Windows and moved it into attrstr.h. Let's merge back.

This commit is contained in:
Pietro Gagliardi 2018-04-18 00:54:24 -04:00
parent 4df47a6ee8
commit 52dc39a553
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/attrstr.h
View File

@ -1,5 +1,9 @@
// 19 february 2018 // 19 february 2018
#ifdef __cplusplus
extern "C" {
#endif
// attribute.c // attribute.c
extern uiAttribute *uiprivAttributeRetain(uiAttribute *a); extern uiAttribute *uiprivAttributeRetain(uiAttribute *a);
extern void uiprivAttributeRelease(uiAttribute *a); extern void uiprivAttributeRelease(uiAttribute *a);
@ -36,3 +40,7 @@ struct uiprivGraphemes {
}; };
extern int uiprivGraphemesTakesUTF16(void); extern int uiprivGraphemesTakesUTF16(void);
extern uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len); extern uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len);
#ifdef __cplusplus
}
#endif

2
windows/attrstr.hpp
View File

@ -1,7 +1,5 @@
// 11 march 2018 // 11 march 2018
extern "C" {
#include "../common/attrstr.h" #include "../common/attrstr.h"
}
// dwrite.cpp // dwrite.cpp
extern IDWriteFactory *dwfactory; extern IDWriteFactory *dwfactory;