mirror of
https://github.com/ultimatepp/ultimatepp.git
synced 2026-05-15 14:16:07 -06:00
RichText: Fixed to achieve compatibility with older CLANG
git-svn-id: svn://ultimatepp.org/upp/trunk@10928 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
parent
cb93eab610
commit
504c1d13cc
5 changed files with 23 additions and 0 deletions
|
|
@ -46,7 +46,11 @@ public:
|
|||
bool IsEmpty() const { return !bio; }
|
||||
|
||||
bool Set(BIO *b) { Clear(); return !!(bio = b); }
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x10100000L
|
||||
bool Create(const BIO_METHOD *meth) { return Set(BIO_new(meth)); }
|
||||
#else
|
||||
bool Create(BIO_METHOD *meth) { return Set(BIO_new(meth)); }
|
||||
#endif
|
||||
void Clear() { if(bio) { BIO_free(bio); bio = NULL; } }
|
||||
|
||||
bool OpenBuffer(const char *data, int length);
|
||||
|
|
|
|||
6
uppsrc/Core/SSL/init
Normal file
6
uppsrc/Core/SSL/init
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
#ifndef _Core_SSL_icpp_init_stub
|
||||
#define _Core_SSL_icpp_init_stub
|
||||
#define BLITZ_INDEX__ F92bd8f18f9eb3ff16ad250c0ea8df0e9
|
||||
#include "Init.icpp"
|
||||
#undef BLITZ_INDEX__
|
||||
#endif
|
||||
4
uppsrc/RichEdit/init
Normal file
4
uppsrc/RichEdit/init
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
#ifndef _RichEdit_icpp_init_stub
|
||||
#define _RichEdit_icpp_init_stub
|
||||
#include "CtrlLib/init"
|
||||
#endif
|
||||
|
|
@ -110,6 +110,9 @@ private:
|
|||
|
||||
PaintRow& operator[](int i) { return row[i]; }
|
||||
const PaintRow& operator[](int i) const { return row[i]; }
|
||||
|
||||
rval_default(Layout); // Old CLANG requires this
|
||||
Layout() {}
|
||||
};
|
||||
|
||||
struct TabLayout : Layout {
|
||||
|
|
@ -123,6 +126,7 @@ private:
|
|||
Rect next_page;
|
||||
Rect header_page;
|
||||
|
||||
rval_default(TabLayout); // Old CLANG requires this
|
||||
TabLayout() {}
|
||||
};
|
||||
|
||||
|
|
|
|||
5
uppsrc/RichText/init
Normal file
5
uppsrc/RichText/init
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
#ifndef _RichText_icpp_init_stub
|
||||
#define _RichText_icpp_init_stub
|
||||
#include "plugin\png/init"
|
||||
#include "Draw/init"
|
||||
#endif
|
||||
Loading…
Add table
Add a link
Reference in a new issue