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:
parent
4df47a6ee8
commit
52dc39a553
|
@ -1,5 +1,9 @@
|
|||
// 19 february 2018
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
// attribute.c
|
||||
extern uiAttribute *uiprivAttributeRetain(uiAttribute *a);
|
||||
extern void uiprivAttributeRelease(uiAttribute *a);
|
||||
|
@ -36,3 +40,7 @@ struct uiprivGraphemes {
|
|||
};
|
||||
extern int uiprivGraphemesTakesUTF16(void);
|
||||
extern uiprivGraphemes *uiprivNewGraphemes(void *s, size_t len);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
// 11 march 2018
|
||||
extern "C" {
|
||||
#include "../common/attrstr.h"
|
||||
}
|
||||
|
||||
// dwrite.cpp
|
||||
extern IDWriteFactory *dwfactory;
|
||||
|
|
Loading…
Reference in New Issue