From bff08096035826887e37ec3a77c6199641636335 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 5 Dec 2013 23:50:31 +0100
Subject: [PATCH] x86_64: fixed GLTeapot and libglut build

---
 src/apps/glteapot/ObjectView.cpp | 8 ++++----
 src/libs/glut/glutEvent.cpp      | 6 +++---
 src/libs/glut/glutWindow.h       | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/apps/glteapot/ObjectView.cpp b/src/apps/glteapot/ObjectView.cpp
index 35dd22609d..5c3e0ffef1 100644
--- a/src/apps/glteapot/ObjectView.cpp
+++ b/src/apps/glteapot/ObjectView.cpp
@@ -74,7 +74,7 @@ light lights[] = {
 long
 signalEvent(sem_id event)
 {
-	long c;
+	int32 c;
 	get_sem_count(event,&c);
 	if (c < 0)
 		release_sem_etc(event,-c,0);
@@ -86,7 +86,7 @@ signalEvent(sem_id event)
 long
 setEvent(sem_id event)
 {
-	long c;
+	int32 c;
 	get_sem_count(event,&c);
 	if (c < 0)
 	  release_sem_etc(event,-c,0);
@@ -100,7 +100,7 @@ waitEvent(sem_id event)
 {
 	acquire_sem(event);
 
-	long c;
+	int32 c;
 	get_sem_count(event,&c);
 	if (c > 0)
 		acquire_sem_etc(event,c,0,0);
@@ -265,7 +265,7 @@ ObjectView::DetachedFromWindow()
 {
 	BGLView::DetachedFromWindow();
 
-	long dummy;
+	status_t dummy;
 	long locks = 0;
 
 	while (Window()->IsLocked()) {
diff --git a/src/libs/glut/glutEvent.cpp b/src/libs/glut/glutEvent.cpp
index 3e5b920d81..0197a45b25 100644
--- a/src/libs/glut/glutEvent.cpp
+++ b/src/libs/glut/glutEvent.cpp
@@ -741,7 +741,7 @@ void GlutWindow::MouseCheck()
  *	DESCRIPTION:  handles entry, motion, and passive events
  ***********************************************************/
 void GlutWindow::MouseMoved(BPoint point,
-						ulong transit, const BMessage *msg)
+						uint32 transit, const BMessage *msg)
 {
 	BGLView::MouseMoved(point,transit,msg);
 
@@ -880,7 +880,7 @@ void GlutWindow::ErrorCallback(unsigned long errorCode) {
  *			wait for response, then clean up afterwards and
  *			send appropriate messages
  ***********************************************************/
-long GlutWindow::MenuThread(void *m) {
+status_t GlutWindow::MenuThread(void *m) {
 	GlutPopUp *bmenu = static_cast<GlutPopUp*>(m);
 	GlutWindow *win = bmenu->win;	// my window
 	GlutBMenuItem *result = (GlutBMenuItem*)bmenu->Go(bmenu->point);
@@ -901,5 +901,5 @@ long GlutWindow::MenuThread(void *m) {
 	win->Window()->Unlock();
 	gBlock.NewEvent();
 	delete bmenu;
-	return 0;
+	return B_OK;
 }
diff --git a/src/libs/glut/glutWindow.h b/src/libs/glut/glutWindow.h
index 5ac3d3a6f3..4417468b83 100644
--- a/src/libs/glut/glutWindow.h
+++ b/src/libs/glut/glutWindow.h
@@ -33,7 +33,7 @@ public:
 	void MouseCheck();	// check for button state changes
 	void ErrorCallback(unsigned long errorCode);
 
-	static long MenuThread(void *menu);
+	static status_t MenuThread(void *menu);
 
 	int num;			// window number returned to user
 	int cursor;			// my cursor