Revision: 8880
http://playerstage.svn.sourceforge.net/playerstage/?rev=8880&view=rev
Author: jpgr87
Date: 2010-09-04 23:14:37 +0000 (Sat, 04 Sep 2010)
Log Message:
-----------
Applied patch #3046090: Some more WIN32 compilation issues, made modificatons
to fix other compile errors
Modified Paths:
--------------
code/player/trunk/cmake/internal/SearchForStuff.cmake
code/player/trunk/libplayercore/driver.h
code/player/trunk/server/drivers/gps/gbxgarminacfr.cc
code/player/trunk/utils/playerv/pv_dev_localize.c
Modified: code/player/trunk/cmake/internal/SearchForStuff.cmake
===================================================================
--- code/player/trunk/cmake/internal/SearchForStuff.cmake 2010-09-02
05:19:19 UTC (rev 8879)
+++ code/player/trunk/cmake/internal/SearchForStuff.cmake 2010-09-04
23:14:37 UTC (rev 8880)
@@ -35,15 +35,15 @@
ENDIF (HAVE_XDR)
SET (CMAKE_REQUIRED_LIBRARIES)
-IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+IF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
INCLUDE (CheckStructHasMember)
CHECK_STRUCT_HAS_MEMBER ("struct timespec" tv_sec time.h
HAVE_STRUCT_TIMESPEC)
-ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
INCLUDE (CheckCSourceCompiles)
SET (CHECK_TIMESPEC_SOURCE_CODE "#include <time.h>
-int main () { struct timespec *tmp; return 0; }")
+int main () { struct timespec *tmp; tmp->tv_sec = 1; return 0; }")
CHECK_C_SOURCE_COMPILES ("${CHECK_TIMESPEC_SOURCE_CODE}"
HAVE_STRUCT_TIMESPEC)
-ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 6)
+ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION GREATER 5)
CHECK_FUNCTION_EXISTS (gettimeofday HAVE_GETTIMEOFDAY)
CHECK_FUNCTION_EXISTS (usleep HAVE_USLEEP)
Modified: code/player/trunk/libplayercore/driver.h
===================================================================
--- code/player/trunk/libplayercore/driver.h 2010-09-02 05:19:19 UTC (rev
8879)
+++ code/player/trunk/libplayercore/driver.h 2010-09-04 23:14:37 UTC (rev
8880)
@@ -606,7 +606,7 @@
int section,
bool overwrite_cmds,
size_t queue_maxlen,
- int interface);
+ int interface_);
/** @brief Constructor for multiple-interface drivers.
Modified: code/player/trunk/server/drivers/gps/gbxgarminacfr.cc
===================================================================
--- code/player/trunk/server/drivers/gps/gbxgarminacfr.cc 2010-09-02
05:19:19 UTC (rev 8879)
+++ code/player/trunk/server/drivers/gps/gbxgarminacfr.cc 2010-09-04
23:14:37 UTC (rev 8880)
@@ -153,10 +153,11 @@
int GbxGarminAcfr::MainSetup (void)
{
// Validate the configuration
- std::string reason;
- if (!_config.isValid (reason))
+ // std::string reason;
+ if (!_config.isValid ())
{
- PLAYER_ERROR1("GbxGarminAcfr: Invalid sensor configuration: %s.\n",
reason.c_str());
+ //PLAYER_ERROR1("GbxGarminAcfr: Invalid sensor configuration: %s.\n",
reason.c_str());
+ PLAYER_ERROR("GbxGarminAcfr: Invalid sensor configuration.\n");
return -1;
}
Modified: code/player/trunk/utils/playerv/pv_dev_localize.c
===================================================================
--- code/player/trunk/utils/playerv/pv_dev_localize.c 2010-09-02 05:19:19 UTC
(rev 8879)
+++ code/player/trunk/utils/playerv/pv_dev_localize.c 2010-09-04 23:14:37 UTC
(rev 8880)
@@ -30,6 +30,10 @@
#include <string.h>
#include "playerv.h"
+#if defined (WIN32)
+ #define M_PI_2 (M_PI/2.0)
+#endif
+
// Compute eigen values and eigen vectors of a 2x2 covariance matrix
static void eigen(double cm[][2], double values[], double vectors[][2]);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:
Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
