[haiku-commits] r37289 - in haiku/trunk: headers/os/opengl src/kits/opengl
- From: wpjvandermeer@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 28 Jun 2010 11:03:55 +0200 (CEST)
Author: wim
Date: 2010-06-28 11:03:55 +0200 (Mon, 28 Jun 2010)
New Revision: 37289
Changeset: http://dev.haiku-os.org/changeset/37289/haiku
Modified:
haiku/trunk/headers/os/opengl/GLView.h
haiku/trunk/src/kits/opengl/GLView.cpp
Log:
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.
Modified: haiku/trunk/headers/os/opengl/GLView.h
===================================================================
--- haiku/trunk/headers/os/opengl/GLView.h 2010-06-28 07:21:37 UTC (rev
37288)
+++ haiku/trunk/headers/os/opengl/GLView.h 2010-06-28 09:03:55 UTC (rev
37289)
@@ -35,9 +35,17 @@
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();
Modified: haiku/trunk/src/kits/opengl/GLView.cpp
===================================================================
--- haiku/trunk/src/kits/opengl/GLView.cpp 2010-06-28 07:21:37 UTC (rev
37288)
+++ haiku/trunk/src/kits/opengl/GLView.cpp 2010-06-28 09:03:55 UTC (rev
37289)
@@ -55,8 +55,15 @@
};
+// 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)
Other related posts:
