Revision: 8743
http://playerstage.svn.sourceforge.net/playerstage/?rev=8743&view=rev
Author: gbiggs
Date: 2010-06-02 06:57:33 +0000 (Wed, 02 Jun 2010)
Log Message:
-----------
Applied patch #2993776: WIN32 compilation issues patch
Modified Paths:
--------------
code/player/trunk/libplayerinterface/addr_util.c
code/player/trunk/rtk2/rtk.c
code/player/trunk/rtk2/rtk_fig.c
code/player/trunk/server/drivers/camera/imageseq/imageseq.cc
code/player/trunk/server/drivers/gps/gbxgarminacfr.cc
code/player/trunk/server/drivers/map/vmapfile.cc
code/player/trunk/server/drivers/mixed/mricp/include/Timer.h
code/player/trunk/server/drivers/mixed/mricp/src/map.cpp
code/player/trunk/server/drivers/mixed/mricp/src/mricp_driver.cpp
code/player/trunk/server/drivers/planner/wavefront/wavefront.cc
code/player/trunk/utils/playercam/playercam.c
code/player/trunk/utils/playernav/gui.c
code/player/trunk/utils/playernav/playernav.c
code/player/trunk/utils/playerv/opt.h
code/player/trunk/utils/playerv/playerv.c
code/player/trunk/utils/playerv/pv_dev_map.c
code/player/trunk/utils/pmap/lodo_driver.cc
code/player/trunk/utils/pmap/pmap.cpp
code/player/trunk/utils/pmap/slap.cpp
Modified: code/player/trunk/libplayerinterface/addr_util.c
===================================================================
--- code/player/trunk/libplayerinterface/addr_util.c 2010-06-01 06:22:38 UTC
(rev 8742)
+++ code/player/trunk/libplayerinterface/addr_util.c 2010-06-02 06:57:33 UTC
(rev 8743)
@@ -43,7 +43,7 @@
#include <assert.h>
#include <sys/types.h>
#if defined WIN32
- #include <Winsock2.h>
+ #include <winsock2.h>
#define snprintf _snprintf
#else
#include <unistd.h>
Modified: code/player/trunk/rtk2/rtk.c
===================================================================
--- code/player/trunk/rtk2/rtk.c 2010-06-01 06:22:38 UTC (rev 8742)
+++ code/player/trunk/rtk2/rtk.c 2010-06-02 06:57:33 UTC (rev 8743)
@@ -39,7 +39,6 @@
#include "avcodec.h"
#endif
-//#define DEBUG
#include "rtk.h"
#include "rtkprivate.h"
@@ -192,7 +191,7 @@
// Event processing function. Returns non-zero if the app should quit.
int rtk_app_main_loop(rtk_app_t *app)
{
- int ret;
+ int ret = 0;
rtk_canvas_t *canvas;
rtk_table_t *table;
Modified: code/player/trunk/rtk2/rtk_fig.c
===================================================================
--- code/player/trunk/rtk2/rtk_fig.c 2010-06-01 06:22:38 UTC (rev 8742)
+++ code/player/trunk/rtk2/rtk_fig.c 2010-06-02 06:57:33 UTC (rev 8743)
@@ -38,6 +38,10 @@
#include "rtk.h"
#include "rtkprivate.h"
+#ifndef M_PI
+ #define M_PI 3.14159265358979323846
+#endif
+
// Draw the selection
void rtk_fig_render_selection(rtk_fig_t *fig);
Modified: code/player/trunk/server/drivers/camera/imageseq/imageseq.cc
===================================================================
--- code/player/trunk/server/drivers/camera/imageseq/imageseq.cc
2010-06-01 06:22:38 UTC (rev 8742)
+++ code/player/trunk/server/drivers/camera/imageseq/imageseq.cc
2010-06-02 06:57:33 UTC (rev 8743)
@@ -86,19 +86,19 @@
/** @} */
#include <string.h>
-#include <stdlib.h>
#include <stddef.h>
#ifndef WIN32
-#include <unistd.h>
+ #include <unistd.h>
#endif
#include <time.h> // for nanosleep() and struct timespec
#include <stdlib.h> // for atoi(3)
#include <math.h>
+#include <libplayercore/playercore.h>
+
#include <cv.h>
#include <highgui.h>
-#include <libplayercore/playercore.h>
class ImageSeq : public ThreadedDriver
{
Modified: code/player/trunk/server/drivers/gps/gbxgarminacfr.cc
===================================================================
--- code/player/trunk/server/drivers/gps/gbxgarminacfr.cc 2010-06-01
06:22:38 UTC (rev 8742)
+++ code/player/trunk/server/drivers/gps/gbxgarminacfr.cc 2010-06-02
06:57:33 UTC (rev 8743)
@@ -152,9 +152,10 @@
int GbxGarminAcfr::MainSetup (void)
{
// Validate the configuration
- if (!_config.isValid ())
+ std::string reason;
+ if (!_config.isValid (reason))
{
- PLAYER_ERROR ("GbxGarminAcfr: Invalid sensor configuration.\n");
+ PLAYER_ERROR1("GbxGarminAcfr: Invalid sensor configuration: %s.\n",
reason.c_str());
return -1;
}
Modified: code/player/trunk/server/drivers/map/vmapfile.cc
===================================================================
--- code/player/trunk/server/drivers/map/vmapfile.cc 2010-06-01 06:22:38 UTC
(rev 8742)
+++ code/player/trunk/server/drivers/map/vmapfile.cc 2010-06-02 06:57:33 UTC
(rev 8743)
@@ -92,6 +92,10 @@
#define FMAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
+#if defined WIN32
+ #define strcasecmp _stricmp
+#endif
+
class VMapFile : public Driver
{
private:
Modified: code/player/trunk/server/drivers/mixed/mricp/include/Timer.h
===================================================================
--- code/player/trunk/server/drivers/mixed/mricp/include/Timer.h
2010-06-01 06:22:38 UTC (rev 8742)
+++ code/player/trunk/server/drivers/mixed/mricp/include/Timer.h
2010-06-02 06:57:33 UTC (rev 8743)
@@ -20,8 +20,16 @@
#ifndef TIMER_H_
#define TIMER_H_
-#include <sys/time.h>
+
+#if defined WIN32
+ #include <replace.h>
+ #include <Winsock2.h> // For struct timeval
+#else
+ #include <sys/time.h>
+#endif
#include <iostream>
+
+
class MricpTimer
{
private:
Modified: code/player/trunk/server/drivers/mixed/mricp/src/map.cpp
===================================================================
--- code/player/trunk/server/drivers/mixed/mricp/src/map.cpp 2010-06-01
06:22:38 UTC (rev 8742)
+++ code/player/trunk/server/drivers/mixed/mricp/src/map.cpp 2010-06-02
06:57:33 UTC (rev 8743)
@@ -24,6 +24,9 @@
#include <iostream>
using namespace std;
+#if defined WIN32
+ #define snprintf _snprintf
+#endif
MAP::MAP(char * Mapname, double pixel_size, double map_size)
{
Modified: code/player/trunk/server/drivers/mixed/mricp/src/mricp_driver.cpp
===================================================================
--- code/player/trunk/server/drivers/mixed/mricp/src/mricp_driver.cpp
2010-06-01 06:22:38 UTC (rev 8742)
+++ code/player/trunk/server/drivers/mixed/mricp/src/mricp_driver.cpp
2010-06-02 06:57:33 UTC (rev 8743)
@@ -31,11 +31,16 @@
#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <sys/time.h>
+#if defined WIN32
+ #define snprintf _snprintf
+#else
+ #include <unistd.h>
+ #include <sys/time.h>
+ #include <termios.h>
+ #include <netinet/in.h>
+#endif
#include <fcntl.h>
-#include <termios.h>
#include <cstdio>
-#include <unistd.h>
#include <cstdlib>
#include <cstddef>
#include <cerrno>
@@ -47,7 +52,6 @@
#include <iostream>
#include <csignal>
#include <vector>
-#include <netinet/in.h>
// Player includes
#include <libplayercore/playercore.h>
Modified: code/player/trunk/server/drivers/planner/wavefront/wavefront.cc
===================================================================
--- code/player/trunk/server/drivers/planner/wavefront/wavefront.cc
2010-06-01 06:22:38 UTC (rev 8742)
+++ code/player/trunk/server/drivers/planner/wavefront/wavefront.cc
2010-06-02 06:57:33 UTC (rev 8743)
@@ -215,16 +215,18 @@
#include <string.h>
#include <stddef.h>
#include <stdlib.h>
-#include <unistd.h>
#include <assert.h>
#include <math.h>
+#ifndef WIN32
+ #include <unistd.h>
+ #include <sys/time.h>
+#endif
#include <libplayercore/playercore.h>
#include <libplayerinterface/functiontable.h>
#include "plan.h"
-#include <sys/time.h>
static double get_time(void);
//extern "C" { void draw_cspace(plan_t* plan, const char* fname); }
Modified: code/player/trunk/utils/playercam/playercam.c
===================================================================
--- code/player/trunk/utils/playercam/playercam.c 2010-06-01 06:22:38 UTC
(rev 8742)
+++ code/player/trunk/utils/playercam/playercam.c 2010-06-02 06:57:33 UTC
(rev 8743)
@@ -78,9 +78,15 @@
#include "config.h"
-#include <stdint.h>
+#if defined WIN32
+ #include <replace.h>
+ #define strcasecmp _stricmp
+#else
+ #include <stdint.h>
+ #include <unistd.h>
+#endif
+
#include <assert.h>
-#include <unistd.h>
#include <math.h>
#include <string.h>
#include <stdlib.h>
Modified: code/player/trunk/utils/playernav/gui.c
===================================================================
--- code/player/trunk/utils/playernav/gui.c 2010-06-01 06:22:38 UTC (rev
8742)
+++ code/player/trunk/utils/playernav/gui.c 2010-06-02 06:57:33 UTC (rev
8743)
@@ -21,7 +21,12 @@
*/
#include <math.h>
-#include <sys/time.h>
+#if defined WIN32
+ #define PATH_MAX 260
+ #define snprintf _snprintf
+#else
+ #include <sys/time.h>
+#endif
#include <gdk/gdkkeysyms.h>
Modified: code/player/trunk/utils/playernav/playernav.c
===================================================================
--- code/player/trunk/utils/playernav/playernav.c 2010-06-01 06:22:38 UTC
(rev 8742)
+++ code/player/trunk/utils/playernav/playernav.c 2010-06-02 06:57:33 UTC
(rev 8743)
@@ -134,7 +134,9 @@
#include <signal.h>
#include <string.h>
#include <math.h>
-#include <sys/time.h>
+#ifndef WIN32
+ #include <sys/time.h>
+#endif
#include "playernav.h"
Modified: code/player/trunk/utils/playerv/opt.h
===================================================================
--- code/player/trunk/utils/playerv/opt.h 2010-06-01 06:22:38 UTC (rev
8742)
+++ code/player/trunk/utils/playerv/opt.h 2010-06-02 06:57:33 UTC (rev
8743)
@@ -27,6 +27,9 @@
#ifndef OPT_H
#define OPT_H
+#if defined WIN32
+ #define snprintf _snprintf
+#endif
// Structure describing a single option.
// This structure is opaque.
Modified: code/player/trunk/utils/playerv/playerv.c
===================================================================
--- code/player/trunk/utils/playerv/playerv.c 2010-06-01 06:22:38 UTC (rev
8742)
+++ code/player/trunk/utils/playerv/playerv.c 2010-06-02 06:57:33 UTC (rev
8743)
@@ -120,8 +120,12 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <unistd.h>
#include <time.h>
+#if defined WIN32
+ #include <replace.h>
+#else
+ #include <unistd.h>
+#endif
#include "playerv.h"
#define GUI_UPDATE_RATE 20.0
@@ -175,8 +179,12 @@
rtk_init(&argc, &argv);
// Register signal handlers
+#ifdef SIGINT
signal(SIGINT, sig_quit);
+#endif
+#ifdef SIGQUIT
signal(SIGQUIT, sig_quit);
+#endif
// Load program options
opt = opt_init(argc, argv, NULL);
Modified: code/player/trunk/utils/playerv/pv_dev_map.c
===================================================================
--- code/player/trunk/utils/playerv/pv_dev_map.c 2010-06-01 06:22:38 UTC
(rev 8742)
+++ code/player/trunk/utils/playerv/pv_dev_map.c 2010-06-02 06:57:33 UTC
(rev 8743)
@@ -27,6 +27,9 @@
#include <assert.h>
#include <stdlib.h>
#include <string.h>
+#if defined WIN32
+ #include <replace.h>
+#endif
#include "playerv.h"
@@ -161,7 +164,8 @@
for( x=0; x<map->proxy->width; x++ )
for( y=0; y<map->proxy->height; y++ )
- {
+ {
+
val = map->proxy->cells[ x + y * map->proxy->width ];
if (val == 0)
continue;
@@ -174,7 +178,7 @@
(y - map->proxy->height/2.0) * scale + scale/2.0,
0,
scale, scale, 1);
- }
+ }
return;
}
Modified: code/player/trunk/utils/pmap/lodo_driver.cc
===================================================================
--- code/player/trunk/utils/pmap/lodo_driver.cc 2010-06-01 06:22:38 UTC (rev
8742)
+++ code/player/trunk/utils/pmap/lodo_driver.cc 2010-06-02 06:57:33 UTC (rev
8743)
@@ -146,9 +146,11 @@
*/
-#include <unistd.h>
#include <string.h>
-#include <netinet/in.h>
+#ifndef WIN32
+ #include <unistd.h>
+ #include <netinet/in.h>
+#endif
#include <libplayercore/playercore.h>
Modified: code/player/trunk/utils/pmap/pmap.cpp
===================================================================
--- code/player/trunk/utils/pmap/pmap.cpp 2010-06-01 06:22:38 UTC (rev
8742)
+++ code/player/trunk/utils/pmap/pmap.cpp 2010-06-02 06:57:33 UTC (rev
8743)
@@ -30,6 +30,7 @@
#include <float.h>
#if defined (WIN32)
#define finite _finite
+ #include <gsl/gsl_math.h>
#endif
#include <stdlib.h>
#include <stdio.h>
Modified: code/player/trunk/utils/pmap/slap.cpp
===================================================================
--- code/player/trunk/utils/pmap/slap.cpp 2010-06-01 06:22:38 UTC (rev
8742)
+++ code/player/trunk/utils/pmap/slap.cpp 2010-06-02 06:57:33 UTC (rev
8743)
@@ -27,6 +27,10 @@
#include <math.h>
#include "slap.h"
+#if defined WIN32
+ #include <float.h>
+ #define isnan _isnan
+#endif
/* Set vector elements. */
vector2_t vector2_set(double v0, double v1)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
