Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Wim van der Meer 2010-06-28 09:03:55 +00:00
parent 12039d82c4
commit 31f2baa4fd
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
headers/os/opengl/GLView.h
View File

@ -35,9 +35,17 @@ class GLRendererRoster;
class BGLView : public BView {
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,
ulong resizingMode, ulong mode,
ulong options);
#endif
virtual ~BGLView();
void LockGL();

7
src/kits/opengl/GLView.cpp
View File

@ -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,
ulong options)
#endif
:
BView(rect, name, B_FOLLOW_ALL_SIDES, mode | B_WILL_DRAW | B_FRAME_EVENTS),
// | B_FULL_UPDATE_ON_RESIZE)