[haiku-commits] haiku: hrev46498 - in src: libs/glut apps/glteapot

  • From: korli@xxxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 5 Dec 2013 23:52:59 +0100 (CET)

hrev46498 adds 1 changeset to branch 'master'
old head: 736fe5bc63e80e95657a12d10d517f718ec91f35
new head: bff08096035826887e37ec3a77c6199641636335
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=bff0809+%5E736fe5b

----------------------------------------------------------------------------

bff0809: x86_64: fixed GLTeapot and libglut build

                                   [ Jerome Duval <jerome.duval@xxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev46498
Commit:      bff08096035826887e37ec3a77c6199641636335
URL:         http://cgit.haiku-os.org/haiku/commit/?id=bff0809
Author:      Jerome Duval <jerome.duval@xxxxxxxxx>
Date:        Thu Dec  5 22:50:31 2013 UTC

----------------------------------------------------------------------------

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

----------------------------------------------------------------------------

diff --git a/src/apps/glteapot/ObjectView.cpp b/src/apps/glteapot/ObjectView.cpp
index 35dd226..5c3e0ff 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 3e5b920..0197a45 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 5ac3d3a..4417468 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


Other related posts:

  • » [haiku-commits] haiku: hrev46498 - in src: libs/glut apps/glteapot - korli