From 31f2baa4fd5b954d4f975c90a114f5f200aa73be Mon Sep 17 00:00:00 2001 From: Wim van der Meer Date: Mon, 28 Jun 2010 09:03:55 +0000 Subject: [PATCH] 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 --- headers/os/opengl/GLView.h | 8 ++++++++ src/kits/opengl/GLView.cpp | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/headers/os/opengl/GLView.h b/headers/os/opengl/GLView.h index f2dbfc24cf..7dcc00ddef 100644 --- a/headers/os/opengl/GLView.h +++ b/headers/os/opengl/GLView.h @@ -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(); diff --git a/src/kits/opengl/GLView.cpp b/src/kits/opengl/GLView.cpp index 3285ebad11..69e6683457 100644 --- a/src/kits/opengl/GLView.cpp +++ b/src/kits/opengl/GLView.cpp @@ -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)