Revision: 6372
http://playerstage.svn.sourceforge.net/playerstage/?rev=6372&view=rev
Author: gbiggs
Date: 2008-04-22 20:51:03 -0700 (Tue, 22 Apr 2008)
Log Message:
-----------
Merging changes 6367:6370 from trunk
Modified Paths:
--------------
code/player/branches/cmake/server/drivers/joystick/linuxjoy.cc
Modified: code/player/branches/cmake/server/drivers/joystick/linuxjoy.cc
===================================================================
--- code/player/branches/cmake/server/drivers/joystick/linuxjoy.cc
2008-04-23 03:44:00 UTC (rev 6371)
+++ code/player/branches/cmake/server/drivers/joystick/linuxjoy.cc
2008-04-23 03:51:03 UTC (rev 6372)
@@ -259,7 +259,7 @@
public: virtual int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
- void * data) {return -1;}
+ void * data) {return 0;}
// Read the joystick
private: void ReadJoy();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
