Changeset r37275 makes the name parameter in the BGLView class constructor a const char*, which breaks binary compatibility with R5.
This change uses _BEOS_R5_COMPATIBLE_ to determine which function prototype to use. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37289 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -35,9 +35,17 @@ class GLRendererRoster;
|
|||||||
|
|
||||||
class BGLView : public BView {
|
class BGLView : public BView {
|
||||||
public:
|
public:
|
||||||
|
// Altough the BeBook has the name parameter as a const char*, the R5 header
|
||||||
|
// doesn't have the const keyword
|
||||||
|
#ifdef _BEOS_R5_COMPATIBLE_
|
||||||
|
BGLView(BRect rect, char* name,
|
||||||
|
ulong resizingMode, ulong mode,
|
||||||
|
ulong options);
|
||||||
|
#else
|
||||||
BGLView(BRect rect, const char* name,
|
BGLView(BRect rect, const char* name,
|
||||||
ulong resizingMode, ulong mode,
|
ulong resizingMode, ulong mode,
|
||||||
ulong options);
|
ulong options);
|
||||||
|
#endif
|
||||||
virtual ~BGLView();
|
virtual ~BGLView();
|
||||||
|
|
||||||
void LockGL();
|
void LockGL();
|
||||||
|
|||||||
@@ -55,8 +55,15 @@ struct glview_direct_info {
|
|||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
// Altough the BeBook has the name parameter as a const char*, the R5 header
|
||||||
|
// doesn't have the const keyword
|
||||||
|
#ifdef _BEOS_R5_COMPATIBLE_
|
||||||
|
BGLView::BGLView(BRect rect, char* name, ulong resizingMode, ulong mode,
|
||||||
|
ulong options)
|
||||||
|
#else
|
||||||
BGLView::BGLView(BRect rect, const char* name, ulong resizingMode, ulong mode,
|
BGLView::BGLView(BRect rect, const char* name, ulong resizingMode, ulong mode,
|
||||||
ulong options)
|
ulong options)
|
||||||
|
#endif
|
||||||
:
|
:
|
||||||
BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS),
|
BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS),
|
||||||
// | B_FULL_UPDATE_ON_RESIZE)
|
// | B_FULL_UPDATE_ON_RESIZE)
|
||||||
|
|||||||
Reference in New Issue
Block a user