Changes to make compatible with VRPN 07.03

panda/src/vrpn/vrpnAnalog.cxx

@@ -112,7 +112,7 @@ write(ostream &out, int indent_level) const {
 //               code and sends it to any interested
 //               VrpnAnalogDevices.
 ////////////////////////////////////////////////////////////////////
-void VrpnAnalog::
+void VRPN_CALLBACK VrpnAnalog::
 vrpn_analog_callback(void *userdata, const vrpn_ANALOGCB info) {
   VrpnAnalog *self = (VrpnAnalog *)userdata;
 

panda/src/vrpn/vrpnAnalog.h

@@ -60,7 +60,7 @@ public:
   void write(ostream &out, int indent_level = 0) const;
 
 private:
-  static void
+  static void VRPN_CALLBACK
   vrpn_analog_callback(void *userdata, const vrpn_ANALOGCB info);
 
 private:

panda/src/vrpn/vrpnButton.cxx

@@ -112,7 +112,7 @@ write(ostream &out, int indent_level) const {
 //               code and sends it to any interested
 //               VrpnButtonDevices.
 ////////////////////////////////////////////////////////////////////
-void VrpnButton::
+void VRPN_CALLBACK VrpnButton::
 vrpn_button_callback(void *userdata, const vrpn_BUTTONCB info) {
   VrpnButton *self = (VrpnButton *)userdata;
   if (vrpn_cat.is_debug()) {

panda/src/vrpn/vrpnButton.h

@@ -60,7 +60,7 @@ public:
   void write(ostream &out, int indent_level = 0) const;
 
 private:
-  static void
+  static void VRPN_CALLBACK
   vrpn_button_callback(void *userdata, const vrpn_BUTTONCB info);
 
 private:

panda/src/vrpn/vrpnClient.cxx

@@ -867,7 +867,7 @@ poll_dial(const string &dial) {
 //  Description: Callback function that merely passes the data down
 //               to the appropriate non-static function
 ////////////////////////////////////////////////////////////////////
-void VrpnClient::
+void VRPN_CALLBACK VrpnClient::
 st_tracker_position(void *userdata, const vrpn_TRACKERCB info) {
   VrpnClientInfo *data = (VrpnClientInfo *)userdata;
   ((VrpnClient *)data->self)->tracker_position(data->device_name, info);
@@ -879,7 +879,7 @@ st_tracker_position(void *userdata, const vrpn_TRACKERCB info) {
 //  Description: Callback function that merely passes the data down
 //               to the appropriate non-static function
 ////////////////////////////////////////////////////////////////////
-void VrpnClient::
+void VRPN_CALLBACK VrpnClient::
 st_tracker_velocity(void *userdata, const vrpn_TRACKERVELCB info) {
   VrpnClientInfo *data = (VrpnClientInfo *)userdata;
   ((VrpnClient *)data->self)->tracker_velocity(data->device_name, info);
@@ -890,7 +890,7 @@ st_tracker_velocity(void *userdata, const vrpn_TRACKERVELCB info) {
 //  Description: Callback function that merely passes the data down
 //               to the appropriate non-static function
 ////////////////////////////////////////////////////////////////////
-void VrpnClient::
+void VRPN_CALLBACK VrpnClient::
 st_tracker_acceleration(void *userdata, const vrpn_TRACKERACCCB info) {
   VrpnClientInfo *data = (VrpnClientInfo *)userdata;
   ((VrpnClient *)data->self)->tracker_acceleration(data->device_name, info);

panda/src/vrpn/vrpnDial.cxx

@@ -112,7 +112,7 @@ write(ostream &out, int indent_level) const {
 //               code and sends it to any interested
 //               VrpnDialDevices.
 ////////////////////////////////////////////////////////////////////
-void VrpnDial::
+void VRPN_CALLBACK VrpnDial::
 vrpn_dial_callback(void *userdata, const vrpn_DIALCB info) {
   VrpnDial *self = (VrpnDial *)userdata;
 

panda/src/vrpn/vrpnDial.h

@@ -60,7 +60,7 @@ public:
   void write(ostream &out, int indent_level = 0) const;
 
 private:
-  static void
+  static void VRPN_CALLBACK
   vrpn_dial_callback(void *userdata, const vrpn_DIALCB info);
 
 private:

panda/src/vrpn/vrpnTracker.cxx

@@ -114,7 +114,7 @@ write(ostream &out, int indent_level) const {
 //               code and sends it to any interested
 //               VrpnTrackerDevices.
 ////////////////////////////////////////////////////////////////////
-void VrpnTracker::
+void VRPN_CALLBACK VrpnTracker::
 vrpn_position_callback(void *userdata, const vrpn_TRACKERCB info) {
   VrpnTracker *self = (VrpnTracker *)userdata;
   if (vrpn_cat.is_spam()) {
@@ -143,7 +143,7 @@ vrpn_position_callback(void *userdata, const vrpn_TRACKERCB info) {
 //               code and sends it to any interested
 //               VrpnTrackerDevices.
 ////////////////////////////////////////////////////////////////////
-void VrpnTracker::
+void VRPN_CALLBACK VrpnTracker::
 vrpn_velocity_callback(void *userdata, const vrpn_TRACKERVELCB info) {
   VrpnTracker *self = (VrpnTracker *)userdata;
   if (vrpn_cat.is_spam()) {
@@ -174,7 +174,7 @@ vrpn_velocity_callback(void *userdata, const vrpn_TRACKERVELCB info) {
 //               code and sends it to any interested
 //               VrpnTrackerDevices.
 ////////////////////////////////////////////////////////////////////
-void VrpnTracker::
+void VRPN_CALLBACK VrpnTracker::
 vrpn_acceleration_callback(void *userdata, const vrpn_TRACKERACCCB info) {
   VrpnTracker *self = (VrpnTracker *)userdata;
   if (vrpn_cat.is_spam()) {

panda/src/vrpn/vrpnTracker.h

@@ -59,11 +59,11 @@ public:
   void write(ostream &out, int indent_level = 0) const;
 
 private:
-  static void
+  static void VRPN_CALLBACK
   vrpn_position_callback(void *userdata, const vrpn_TRACKERCB info);
-  static void
+  static void VRPN_CALLBACK
   vrpn_velocity_callback(void *userdata, const vrpn_TRACKERVELCB info);
-  static void
+  static void VRPN_CALLBACK
   vrpn_acceleration_callback(void *userdata, const vrpn_TRACKERACCCB info);
 
 private: