i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86_64: fixed GLTeapot and libglut build

Browse Source
This commit is contained in:
Jerome Duval
2013-12-05 23:52:24 +01:00
parent 736fe5bc63
commit bff0809603
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/glteapot/ObjectView.cpp
+4 -4
View File
@@ -74,7 +74,7 @@ light lights[] = {
long long
signalEvent(sem_id event) signalEvent(sem_id event)
{ {
long c; int32 c;
get_sem_count(event,&c); get_sem_count(event,&c);
if (c < 0) if (c < 0)
release_sem_etc(event,-c,0); release_sem_etc(event,-c,0);
@@ -86,7 +86,7 @@ signalEvent(sem_id event)
long long
setEvent(sem_id event) setEvent(sem_id event)
{ {
long c; int32 c;
get_sem_count(event,&c); get_sem_count(event,&c);
if (c < 0) if (c < 0)
release_sem_etc(event,-c,0); release_sem_etc(event,-c,0);
@@ -100,7 +100,7 @@ waitEvent(sem_id event)
{ {
acquire_sem(event); acquire_sem(event);
long c; int32 c;
get_sem_count(event,&c); get_sem_count(event,&c);
if (c > 0) if (c > 0)
acquire_sem_etc(event,c,0,0); acquire_sem_etc(event,c,0,0);
@@ -265,7 +265,7 @@ ObjectView::DetachedFromWindow()
{ {
BGLView::DetachedFromWindow(); BGLView::DetachedFromWindow();
long dummy; status_t dummy;
long locks = 0; long locks = 0;
while (Window()->IsLocked()) { while (Window()->IsLocked()) {
src/libs/glut/glutEvent.cpp
+3 -3
View File
@@ -741,7 +741,7 @@ void GlutWindow::MouseCheck()
* DESCRIPTION: handles entry, motion, and passive events * DESCRIPTION: handles entry, motion, and passive events
***********************************************************/ ***********************************************************/
void GlutWindow::MouseMoved(BPoint point, void GlutWindow::MouseMoved(BPoint point,
ulong transit, const BMessage *msg) uint32 transit, const BMessage *msg)
{ {
BGLView::MouseMoved(point,transit,msg); BGLView::MouseMoved(point,transit,msg);
@@ -880,7 +880,7 @@ void GlutWindow::ErrorCallback(unsigned long errorCode) {
* wait for response, then clean up afterwards and * wait for response, then clean up afterwards and
* send appropriate messages * send appropriate messages
***********************************************************/ ***********************************************************/
long GlutWindow::MenuThread(void *m) { status_t GlutWindow::MenuThread(void *m) {
GlutPopUp *bmenu = static_cast<GlutPopUp*>(m); GlutPopUp *bmenu = static_cast<GlutPopUp*>(m);
GlutWindow *win = bmenu->win; // my window GlutWindow *win = bmenu->win; // my window
GlutBMenuItem *result = (GlutBMenuItem*)bmenu->Go(bmenu->point); GlutBMenuItem *result = (GlutBMenuItem*)bmenu->Go(bmenu->point);
@@ -901,5 +901,5 @@ long GlutWindow::MenuThread(void *m) {
win->Window()->Unlock(); win->Window()->Unlock();
gBlock.NewEvent(); gBlock.NewEvent();
delete bmenu; delete bmenu;
return 0; return B_OK;
} }
src/libs/glut/glutWindow.h
+1 -1
View File
@@ -33,7 +33,7 @@ public:
void MouseCheck(); // check for button state changes void MouseCheck(); // check for button state changes
void ErrorCallback(unsigned long errorCode); void ErrorCallback(unsigned long errorCode);
static long MenuThread(void *menu); static status_t MenuThread(void *menu);
int num; // window number returned to user int num; // window number returned to user
int cursor; // my cursor int cursor; // my cursor