Revision: 7324
http://playerstage.svn.sourceforge.net/playerstage/?rev=7324&view=rev
Author: gbiggs
Date: 2009-02-10 03:58:02 +0000 (Tue, 10 Feb 2009)
Log Message:
-----------
Fixes to compile with Sun Studio
Modified Paths:
--------------
code/player/trunk/client_libs/libplayerc/dev_ranger.c
code/player/trunk/client_libs/libplayerc/dev_speech_recognition.c
code/player/trunk/client_libs/libplayerc/dev_vectormap.c
code/player/trunk/cmake/internal/SearchForStuff.cmake
code/player/trunk/config.h.in
code/player/trunk/rtk2/rtk_canvas.c
code/player/trunk/rtk2/rtk_menu.c
code/player/trunk/server/drivers/localization/amcl/pf/pf_vector.c
code/player/trunk/server/drivers/map/mapcspace.cc
code/player/trunk/server/drivers/mixed/erratic/erratic.h
code/player/trunk/server/drivers/mixed/nomad/Nclient.c
code/player/trunk/server/drivers/position/ascension/flockofbirds.cc
code/player/trunk/utils/logsplitter/CMakeLists.txt
code/player/trunk/utils/playerv/playerv.h
Modified: code/player/trunk/client_libs/libplayerc/dev_ranger.c
===================================================================
--- code/player/trunk/client_libs/libplayerc/dev_ranger.c 2009-02-10
01:13:10 UTC (rev 7323)
+++ code/player/trunk/client_libs/libplayerc/dev_ranger.c 2009-02-10
03:58:02 UTC (rev 7324)
@@ -39,6 +39,8 @@
#include <string.h>
#include <math.h>
+#include <stddef.h>
+#include <stdlib.h>
#include "playerc.h"
#include "error.h"
Modified: code/player/trunk/client_libs/libplayerc/dev_speech_recognition.c
===================================================================
--- code/player/trunk/client_libs/libplayerc/dev_speech_recognition.c
2009-02-10 01:13:10 UTC (rev 7323)
+++ code/player/trunk/client_libs/libplayerc/dev_speech_recognition.c
2009-02-10 03:58:02 UTC (rev 7324)
@@ -70,5 +70,5 @@
device->words[jj++] = &device->rawText[ii+1];
}
}
-};
+}
Modified: code/player/trunk/client_libs/libplayerc/dev_vectormap.c
===================================================================
--- code/player/trunk/client_libs/libplayerc/dev_vectormap.c 2009-02-10
01:13:10 UTC (rev 7323)
+++ code/player/trunk/client_libs/libplayerc/dev_vectormap.c 2009-02-10
03:58:02 UTC (rev 7324)
@@ -73,7 +73,7 @@
vfprintf(stderr,format, ap);
fflush(stderr);
va_end(ap);
-};
+}
// Create a new vectormap proxy
playerc_vectormap_t *playerc_vectormap_create(playerc_client_t *client, int
index)
Modified: code/player/trunk/cmake/internal/SearchForStuff.cmake
===================================================================
--- code/player/trunk/cmake/internal/SearchForStuff.cmake 2009-02-10
01:13:10 UTC (rev 7323)
+++ code/player/trunk/cmake/internal/SearchForStuff.cmake 2009-02-10
03:58:02 UTC (rev 7324)
@@ -55,6 +55,7 @@
CHECK_INCLUDE_FILES (strings.h HAVE_STRINGS_H)
CHECK_INCLUDE_FILES (dns_sd.h HAVE_DNS_SD)
CHECK_INCLUDE_FILES (sys/filio.h HAVE_SYS_FILIO_H)
+CHECK_INCLUDE_FILES (ieeefp.h HAVE_IEEEFP_H)
IF (HAVE_DNS_SD)
CHECK_LIBRARY_EXISTS (dns_sd DNSServiceRefDeallocate
"${PLAYER_EXTRA_LIB_DIRS}" HAVE_DNS_SD)
ENDIF (HAVE_DNS_SD)
Modified: code/player/trunk/config.h.in
===================================================================
--- code/player/trunk/config.h.in 2009-02-10 01:13:10 UTC (rev 7323)
+++ code/player/trunk/config.h.in 2009-02-10 03:58:02 UTC (rev 7324)
@@ -21,4 +21,5 @@
#cmakedefine HAVE_SYS_STAT_H 1
#cmakedefine HAVE_SYS_TYPES_H 1
#cmakedefine HAVE_UNISTD_H 1
+#cmakedefine HAVE_IEEEFP_H 1
#cmakedefine WORDS_BIGENDIAN 1
Modified: code/player/trunk/rtk2/rtk_canvas.c
===================================================================
--- code/player/trunk/rtk2/rtk_canvas.c 2009-02-10 01:13:10 UTC (rev 7323)
+++ code/player/trunk/rtk2/rtk_canvas.c 2009-02-10 03:58:02 UTC (rev 7324)
@@ -671,7 +671,7 @@
{
GdkImage *im;
int ix, iy;
- char *pixel;
+ unsigned char *pixel;
guint32 c;
unsigned char r, g, b;
uint8_t *image;
Modified: code/player/trunk/rtk2/rtk_menu.c
===================================================================
--- code/player/trunk/rtk2/rtk_menu.c 2009-02-10 01:13:10 UTC (rev 7323)
+++ code/player/trunk/rtk2/rtk_menu.c 2009-02-10 03:58:02 UTC (rev 7324)
@@ -168,7 +168,7 @@
int rtk_menuitem_enable(rtk_menuitem_t *item, int enable)
{
gtk_widget_set_sensitive(GTK_WIDGET(item->item), enable);
- return;
+ return 0;
}
Modified: code/player/trunk/server/drivers/localization/amcl/pf/pf_vector.c
===================================================================
--- code/player/trunk/server/drivers/localization/amcl/pf/pf_vector.c
2009-02-10 01:13:10 UTC (rev 7323)
+++ code/player/trunk/server/drivers/localization/amcl/pf/pf_vector.c
2009-02-10 03:58:02 UTC (rev 7324)
@@ -10,9 +10,12 @@
//#include <gsl/gsl_matrix.h>
//#include <gsl/gsl_eigen.h>
//#include <gsl/gsl_linalg.h>
+#include <config.h>
#if defined (WIN32)
#include <float.h>
#define finite _finite
+#elif defined (__sun) && defined (HAVE_IEEEFP_H)
+ #include <ieeefp.h>
#endif
#include "pf_vector.h"
@@ -36,11 +39,11 @@
int pf_vector_finite(pf_vector_t a)
{
int i;
-
+
for (i = 0; i < 3; i++)
if (!finite(a.v[i]))
return 0;
-
+
return 1;
}
Modified: code/player/trunk/server/drivers/map/mapcspace.cc
===================================================================
--- code/player/trunk/server/drivers/map/mapcspace.cc 2009-02-10 01:13:10 UTC
(rev 7323)
+++ code/player/trunk/server/drivers/map/mapcspace.cc 2009-02-10 03:58:02 UTC
(rev 7324)
@@ -97,7 +97,7 @@
typedef enum
{
- CIRCLE,
+ CIRCLE
} robot_shape_t;
class MapCspace : public MapTransform
Modified: code/player/trunk/server/drivers/mixed/erratic/erratic.h
===================================================================
--- code/player/trunk/server/drivers/mixed/erratic/erratic.h 2009-02-10
01:13:10 UTC (rev 7323)
+++ code/player/trunk/server/drivers/mixed/erratic/erratic.h 2009-02-10
03:58:02 UTC (rev 7324)
@@ -93,7 +93,7 @@
set_pid_trans_i = 82,
set_pid_rot_p = 83,
set_pid_rot_v = 84,
- set_pid_rot_i = 85,
+ set_pid_rot_i = 85
} command_e;
Modified: code/player/trunk/server/drivers/mixed/nomad/Nclient.c
===================================================================
--- code/player/trunk/server/drivers/mixed/nomad/Nclient.c 2009-02-10
01:13:10 UTC (rev 7323)
+++ code/player/trunk/server/drivers/mixed/nomad/Nclient.c 2009-02-10
03:58:02 UTC (rev 7324)
@@ -155,6 +155,7 @@
#include <fcntl.h>
#include <signal.h>
#include <unistd.h>
+#include <string.h>
#include "Nclient.h"
#define DEBUG
@@ -3609,7 +3610,7 @@
{
long result;
- short b_index, b_length;
+ unsigned short b_index, b_length;
unsigned char serial_number;
unsigned char packet_type;
unsigned char user_send_buffer[256];
@@ -3634,7 +3635,7 @@
{
long result;
- short b_index, b_length;
+ unsigned short b_index, b_length;
unsigned char serial_number;
unsigned char packet_type;
unsigned char user_send_buffer[256];
@@ -3664,7 +3665,7 @@
{
long result;
- short b_index, b_length;
+ unsigned short b_index, b_length;
unsigned char serial_number;
unsigned char packet_type;
unsigned char user_send_buffer[256];
Modified: code/player/trunk/server/drivers/position/ascension/flockofbirds.cc
===================================================================
--- code/player/trunk/server/drivers/position/ascension/flockofbirds.cc
2009-02-10 01:13:10 UTC (rev 7323)
+++ code/player/trunk/server/drivers/position/ascension/flockofbirds.cc
2009-02-10 03:58:02 UTC (rev 7324)
@@ -95,7 +95,7 @@
{
public:
- FlockOfBirdsSerial(char * port = FOB_DEFAULT_PORT, int rate =
FOB_DEFAULT_RATE);
+ FlockOfBirdsSerial(const char * port = FOB_DEFAULT_PORT, int rate =
FOB_DEFAULT_RATE);
~FlockOfBirdsSerial();
bool Open() {return fd >0;};
@@ -132,7 +132,7 @@
};
-FlockOfBirdsSerial::FlockOfBirdsSerial(char * port, int rate)
+FlockOfBirdsSerial::FlockOfBirdsSerial(const char * port, int rate)
{
fd = -1;
Modified: code/player/trunk/utils/logsplitter/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/logsplitter/CMakeLists.txt 2009-02-10 01:13:10 UTC
(rev 7323)
+++ code/player/trunk/utils/logsplitter/CMakeLists.txt 2009-02-10 03:58:02 UTC
(rev 7324)
@@ -1,5 +1,8 @@
OPTION (BUILD_UTILS_LOGSPLITTER "Build the logsplitter utility" ON)
IF (BUILD_UTILS_LOGSPLITTER)
PLAYER_ADD_EXECUTABLE (playerlogsplitter logsplitter.c)
+ IF (HAVE_M)
+ TARGET_LINK_LIBRARIES (playerlogsplitter m)
+ ENDIF (HAVE_M)
# Wow, that one was easy!
ENDIF (BUILD_UTILS_LOGSPLITTER)
Modified: code/player/trunk/utils/playerv/playerv.h
===================================================================
--- code/player/trunk/utils/playerv/playerv.h 2009-02-10 01:13:10 UTC (rev
7323)
+++ code/player/trunk/utils/playerv/playerv.h 2009-02-10 03:58:02 UTC (rev
7324)
@@ -656,7 +656,7 @@
// Image buffer
int allocated_size;
- char *img_buffer;
+ unsigned char *img_buffer;
// Timestamp on most recent data
double datatime;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM)
software. With Adobe AIR, Ajax developers can use existing skills and code to
build responsive, highly engaging applications that combine the power of local
resources and data with the reach of the web. Download the Adobe AIR SDK and
Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
